diff --git a/yum-HEAD.patch b/yum-HEAD.patch index 0bab5dc..1921e79 100644 --- a/yum-HEAD.patch +++ b/yum-HEAD.patch @@ -4522,10 +4522,10 @@ index b6aa277..b3f2c75 100755 mark = '#' diff --git a/po/bn_IN.po b/po/bn_IN.po -index f1f232a..32b8dc4 100644 +index f1f232a..5c6992b 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po -@@ -2,13 +2,14 @@ +@@ -2,427 +2,453 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -4533,22 +4533,24 @@ index f1f232a..32b8dc4 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Bengali (India) (http://www.transifex.net/projects/p/yum/team/bn_IN/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Bengali (India) (http://www.transifex.net/projects/p/yum/team/bn_IN/)\n" ++"Language-Team: Bengali (India) (http://www.transifex.net/projects/p/yum/language/bn_IN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,413 +17,438 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: bn_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -4559,31 +4561,31 @@ index f1f232a..32b8dc4 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -4610,7 +4612,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -4620,69 +4622,69 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -4693,98 +4695,98 @@ index f1f232a..32b8dc4 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -4792,7 +4794,7 @@ index f1f232a..32b8dc4 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -4801,13 +4803,13 @@ index f1f232a..32b8dc4 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -4817,12 +4819,12 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -4832,12 +4834,12 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -4847,14 +4849,14 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -4862,13 +4864,13 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -4876,7 +4878,7 @@ index f1f232a..32b8dc4 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -4884,151 +4886,151 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -5038,18 +5040,18 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -5059,37 +5061,37 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -5098,353 +5100,353 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -5452,157 +5454,157 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -5610,33 +5612,33 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -5647,77 +5649,77 @@ index f1f232a..32b8dc4 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -5726,271 +5728,271 @@ index f1f232a..32b8dc4 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +968,536 @@ msgid "" +@@ -935,484 +968,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -5999,17 +6001,17 @@ index f1f232a..32b8dc4 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -6022,224 +6024,224 @@ index f1f232a..32b8dc4 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -6247,7 +6249,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -6255,7 +6257,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -6263,7 +6265,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -6271,43 +6273,49 @@ index f1f232a..32b8dc4 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -6333,7 +6341,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -6387,7 +6395,7 @@ index f1f232a..32b8dc4 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1505,47 @@ msgid "" +@@ -1420,47 +1511,47 @@ msgid "" "%s" msgstr "" @@ -6444,7 +6452,7 @@ index f1f232a..32b8dc4 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1557,7 @@ msgstr "" +@@ -1472,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -6453,7 +6461,7 @@ index f1f232a..32b8dc4 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1574,480 @@ msgid "" +@@ -1489,451 +1580,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -6623,14 +6631,14 @@ index f1f232a..32b8dc4 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -6750,153 +6758,153 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -6904,7 +6912,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -6912,148 +6920,148 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2058,106 @@ msgstr "" +@@ -1944,100 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -7098,226 +7106,226 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2165,1028 @@ msgstr "" +@@ -2045,991 +2171,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -7325,43 +7333,43 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -7574,7 +7582,7 @@ index f1f232a..32b8dc4 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -7585,40 +7593,46 @@ index f1f232a..32b8dc4 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -7626,23 +7640,23 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -7656,67 +7670,67 @@ index f1f232a..32b8dc4 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -7726,26 +7740,26 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -7755,62 +7769,62 @@ index f1f232a..32b8dc4 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -7818,79 +7832,79 @@ index f1f232a..32b8dc4 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -7898,118 +7912,118 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -8017,7 +8031,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -8025,118 +8039,118 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -8150,7 +8164,7 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -8162,29 +8176,29 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -8192,29 +8206,29 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -8222,117 +8236,117 @@ index f1f232a..32b8dc4 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -8432,10 +8446,15 @@ index f1f232a..32b8dc4 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3195,14 @@ msgstr "" +@@ -3038,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -8447,8 +8466,14 @@ index f1f232a..32b8dc4 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3243,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/ca.po b/po/ca.po -index cca37b7..0b69093 100644 +index cca37b7..8594a97 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,13 +2,14 @@ @@ -8459,22 +8484,23 @@ index cca37b7..0b69093 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,122 +17,124 @@ msgstr "" +@@ -16,930 +17,942 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Actualitzant" @@ -8485,31 +8511,31 @@ index cca37b7..0b69093 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instal·lant" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsolet" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Actualitzat" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Suprimit" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Instal·lat" @@ -8536,7 +8562,7 @@ index cca37b7..0b69093 100644 msgstr "Suprimit: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Suprimint" @@ -8546,69 +8572,69 @@ index cca37b7..0b69093 100644 msgstr "Neteja" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "L'ordre «%s» ja està definida" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Configurant repositoris" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "S'estan llegint les metadades de repositoris des de fitxers locals" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Error de configuració: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Error d'opcions: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instal·lat: %s-%s a %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Muntat : %s a %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Pujat: %s a %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Cal que doneu alguna ordre" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Requeriments de disc:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -8619,104 +8645,107 @@ index cca37b7..0b69093 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -139,62 +142,62 @@ msgstr "" - "Resum d'errors\n" - "-------------\n" +-msgstr "" +-"Resum d'errors\n" +-"-------------\n" ++msgstr "Resum d'errors\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està " - "sortint." +-msgstr "" +-"S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està " +-"sortint." ++msgstr "S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està sortint." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "S'està sortint de l'ordre de l'usuari" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "S'estan baixant els següents paquets:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "S'ha produït un error baixant els següents paquets:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "S'ha produït un error. Necessiteu actualitzar el gestor rpm:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "Cal actualitzar l'RPM" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Siusplau, informeu d'aquest error a %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "S'està executant la transacció de prova" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "S'ha produït un error en la transacció de prova:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "La transacció de prova ha acabat amb èxit" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "S'està executant la transacció" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -202,237 +205,260 @@ msgstr "" - "No s'importaran automàticament les claus en una execució desatesa.\n" - "Feu servir \"-y\" per a importar les claus." +-msgstr "" +-"No s'importaran automàticament les claus en una execució desatesa.\n" +-"Feu servir \"-y\" per a importar les claus." ++msgstr "No s'importaran automàticament les claus en una execució desatesa.\nFeu servir \"-y\" per a importar les claus." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Potser volíeu dir: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paquets %s%s%s disponibles, però no instal·lats." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "El paquet %s%s%s no està disponible." @@ -8724,7 +8753,7 @@ index cca37b7..0b69093 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paquets a instal·lar" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -8733,13 +8762,13 @@ index cca37b7..0b69093 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Res a fer" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paquets marcats per a actualitzar" @@ -8749,12 +8778,12 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "No hi ha cap paquet marcat per a actualitzar" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -8764,12 +8793,12 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paquets marcats per a suprimir" @@ -8779,14 +8808,14 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "No hi ha cap paquet marcat per a suprimir" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paquets per a desactualitzar" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -8794,13 +8823,13 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (des de %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "El paquet instal·lat %s%s%s%s no està disponible." @@ -8808,7 +8837,7 @@ index cca37b7..0b69093 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paquets a reinstal·lar" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -8816,153 +8845,154 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "No s'ha proporcionat cap paquet" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paquets a instal·lar" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Avís: no s'ha trobat cap coincidència per a: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "No s'ha trobat cap coincidència" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "No s'ha trobat cap paquet per a %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "S'està netejant tot" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "S'estan netejant les capçaleres" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "S'estan netejant els paquets" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "S'estan netejant les metadades xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "S'està netejant la memòria cau de la base de dades" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "S'està netejant la memòria cau de metadades que han vençut" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "S'estan netejant els connectors" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Grups instal·lats:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Grups disponibles:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Fet" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Avís: El grup %s no existeix." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups " - "sol·licitats" +-msgstr "" +-"No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups " +-"sol·licitats" ++msgstr "No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups sol·licitats" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paquets a instal·lar" @@ -8972,18 +9002,18 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "No existeix cap grup anomenat %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "No hi ha cap paquet a suprimir dels grups" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paquets a suprimir" @@ -8993,943 +9023,960 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "El paquet %s ja està instal·lat, s'ometrà" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "S'està descartant el paquet no comparable %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible " - "instal·lació" +-msgstr "" +-"No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible " +-"instal·lació" ++msgstr "No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible instal·lació" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opcions del connector" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Error en la línia d'ordres: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -443,286 +469,290 @@ msgstr "" "\n" - "%s: l'opció %s necessita un argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: l'opció %s necessita un argument" ++msgstr "\n\n%s: l'opció %s necessita un argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color pren un valor d'entre: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "mostra el missatge d'ajuda i surt" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "sigues tolerant amb els errors" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "ubicació del fitxer de configuració" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "temps màxim d'espera d'ordres" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "nivell de sortida de depuració" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "mostra duplicats, en repositoris, en les ordres per llistar i cercar" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "nivell de sortida d'error" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "operació silenciosa" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "operació descriptiva" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "respon sí a totes les preguntes" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "mostra la versió del Yum i surt" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "estableix l'arrel de la instal·lació" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "habilita un o més repositoris (es permeten caràcters de reemplaçament)" +-msgstr "" +-"habilita un o més repositoris (es permeten caràcters de reemplaçament)" ++msgstr "habilita un o més repositoris (es permeten caràcters de reemplaçament)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "deshabilita un o més repositoris (es permeten caràcters de reemplaçament)" +-msgstr "" +-"deshabilita un o més repositoris (es permeten caràcters de reemplaçament)" ++msgstr "deshabilita un o més repositoris (es permeten caràcters de reemplaçament)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "exclou els paquets per nom o expressió regular del glob" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "inhabilita l'exclusió des de l'inici, per a un repositori o per a tot" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "habilita el processament d'obsolets durant les actualitzacions" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "inhabilita els connectors de Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "inhabilita la comprobació de signatures gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "inhabilita els connectors pel seu nom" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "habilita els connectors pel seu nom" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "omet paquets amb problemes de resolució de dependències" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "controla sempre que s'usi color" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Gen" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Abr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Mai" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Ago" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Set" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Oct" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Des" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "S'està intentant un altre servidor rèplica." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repo : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Descripció : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "s" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "sí" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "no" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "És correcte [s/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -731,154 +761,156 @@ msgstr "" - "\n" - "Grup: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grup: %s" ++msgstr "\nGrup: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Id de Grup: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Descripció: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Paquets obligatoris:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Paquets per defecte:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Paquets opcionals:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Paquets condicionals:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paquet: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " No hi ha dependències per a aquest paquet" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " dependència: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Dependència insatisfeta" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Coincidències amb:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Llicència : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Fitxer : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Altre : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "S'ha produït un error en calcular la mida total de la descàrrega" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Mida total: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Mida total de la descàrrega: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Tornant a instal·lar" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Desfent l'actualització" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "S'està instal·lant per dependències" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "S'està actualitzant degut a les dependències" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "S'està suprimint degut a les dependències" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Ignorat degut a problemes de dependències:" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paquet" +msgid_plural "Packages" -+msgstr[0] "Paquet" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Paquet" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arq" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versió" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repositori" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Mida" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -889,57 +921,58 @@ msgstr "" - "Resum de la transacció\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Resum de la transacció\n" +-"%s\n" ++msgstr "\nResum de la transacció\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Suprimit" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Dependència suprimida" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Dependència instal·lada" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Dependència actualitzada" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Reemplaçat" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Ha fallat" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "dos" -@@ -947,7 +980,7 @@ msgstr "dos" +@@ -947,559 +960,598 @@ msgstr "dos" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -958,475 +991,527 @@ msgstr "" - " S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s segons\n" - "per a sortir.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s segons\n" +-"per a sortir.\n" ++msgstr "\n S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s segons\nper a sortir.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "interrupció de l'usuari" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -9938,17 +9985,17 @@ index cca37b7..0b69093 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -9961,225 +10008,226 @@ index cca37b7..0b69093 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "instal·lat" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "suprimit" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "actualitzat" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "obsolet" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> S'està executant la transacció de prova" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Tornant a calcular la resolució de dependències amb els nous canvis." +-msgstr "" +-"--> Tornant a calcular la resolució de dependències amb els nous canvis." ++msgstr "--> Tornant a calcular la resolució de dependències amb els nous canvis." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Ha finalitzat la resolució de dependències" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> S'està processant la dependència %s per al paquet: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dependència no resolta: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -10187,7 +10235,7 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -10195,7 +10243,7 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -10203,7 +10251,7 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -10211,45 +10259,52 @@ index cca37b7..0b69093 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> S'està processant el conflicte: %s té un conflicte amb %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau," - " espereu." +-msgstr "" +-"--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau," +-" espereu." ++msgstr "--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau, espereu." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." ++msgstr "---> S'està baixant la capçalera per a %s per a empaquetar dins de la transacció de prova." ++ ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" msgstr "" - "---> S'està baixant la capçalera per a %s per a empaquetar dins de la " - "transacció de prova." +-"---> S'està baixant la capçalera per a %s per a empaquetar dins de la " +-"transacció de prova." -#: ../utils.py:99 +#: ../utils.py:129 @@ -10277,7 +10332,7 @@ index cca37b7..0b69093 100644 msgstr "Traçat/aturat" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Desconegut" @@ -10315,27 +10370,37 @@ index cca37b7..0b69093 100644 msgid "" "\n" "\n" -@@ -1436,7 +1521,7 @@ msgstr "" - "\n" - "S'està sortint per la cancel·lació de l'usuari" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"S'està sortint per la cancel·lació de l'usuari" ++msgstr "\n\nS'està sortint per la cancel·lació de l'usuari" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1446,7 +1531,7 @@ msgstr "" - "\n" - "S'està sortint en trobar la canonada trencada" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"S'està sortint en trobar la canonada trencada" ++msgstr "\n\nS'està sortint en trobar la canonada trencada" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1457,41 +1542,41 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -10383,16 +10448,17 @@ index cca37b7..0b69093 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1499,7 +1584,7 @@ msgstr "" - "\n" - "Dependències resoltes" +-msgstr "" +-"\n" +-"Dependències resoltes" ++msgstr "\nDependències resoltes" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Completat!" -@@ -1511,7 +1596,7 @@ msgstr "" +@@ -1511,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Heu de ser root per a executar aquesta ordre." @@ -10401,9 +10467,25 @@ index cca37b7..0b69093 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1541,362 +1626,351 @@ msgstr "" +@@ -1526,475 +1578,482 @@ msgid "" + "will install it for you.\n" "\n" - "Per a més informació contacteu el vostre distribuïdor o proveïdor de paquets.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Heu habilitat la comprovació de paquets utilitzant claus GPG. És una bona opció. \n" +-"No obstant, no teniu cap clau pública GPG instal·lada. Necessiteu baixar\n" +-"les claus per als paquets que desitgeu instal·lar i instal·lar-les.\n" +-"Podeu fer-ho executant l'ordre:\n" +-" rpm --import clau.pública.gpg\n" +-"\n" +-"\n" +-"També podeu especificar la url de la clau que voleu utilitzar\n" +-"per a un repositori en l'opció 'gpgkey' en la secció d'un repositori i yum \n" +-"la instal·larà per vosaltres.\n" +-"\n" +-"Per a més informació contacteu el vostre distribuïdor o proveïdor de paquets.\n" ++msgstr "\nHeu habilitat la comprovació de paquets utilitzant claus GPG. És una bona opció. \nNo obstant, no teniu cap clau pública GPG instal·lada. Necessiteu baixar\nles claus per als paquets que desitgeu instal·lar i instal·lar-les.\nPodeu fer-ho executant l'ordre:\n rpm --import clau.pública.gpg\n\n\nTambé podeu especificar la url de la clau que voleu utilitzar\nper a un repositori en l'opció 'gpgkey' en la secció d'un repositori i yum \nla instal·larà per vosaltres.\n\nPer a més informació contacteu el vostre distribuïdor o proveïdor de paquets.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -10459,8 +10541,9 @@ index cca37b7..0b69093 100644 -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 msgid "Error: more than one file given as argument to shell." - msgstr "" - "Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres." +-msgstr "" +-"Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres." ++msgstr "Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres." -#: ../yumcommands.py:148 +#: ../yumcommands.py:192 @@ -10608,14 +10691,16 @@ index cca37b7..0b69093 100644 -#: ../yumcommands.py:556 +#: ../yumcommands.py:955 msgid "Making cache files for all metadata files." - msgstr "" - "S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades." +-msgstr "" +-"S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades." ++msgstr "S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades." -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "Això pot trigar una estona depenent de la velocitat d'aquest ordinador" +-msgstr "" +-"Això pot trigar una estona depenent de la velocitat d'aquest ordinador" ++msgstr "Això pot trigar una estona depenent de la velocitat d'aquest ordinador" -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -10702,335 +10787,340 @@ index cca37b7..0b69093 100644 msgstr "Mostra els repositoris de programari configurats" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "habilitat" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "deshabilitat" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Id-repo : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Nom-repo : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Estat-repo : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Repo-revisió : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-etiquetes : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-etiq-dist : " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Repo-actualitzat : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Paquets-repo : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Mida-repo : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "URL-base-repo : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-metaenllaç : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Actualitzat : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Miralls-repo : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Mai (últim: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Temps d'instal·lació (últim: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segons (últim: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Venç-repo : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-exclou : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-inclou : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "id repo" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "estat" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "nom repo" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Mostra un missatge d'ajuda d'ús" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "No hi ha ajuda disponible per a %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1906,7 +1980,7 @@ msgstr "" - "\n" - "àlies: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"àlies: " ++msgstr "\n\nàlies: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1916,85 +1990,125 @@ msgstr "" - "\n" - "àlies: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"àlies: " ++msgstr "\n\nàlies: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "S'està preparant el procés de reinstal·lació" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "reinstal·la un paquet" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "S'està preparant el procés de desactualització" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "desactualitza un paquet" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Mostra una versió per a la màquina i/o repositoris disponibles" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Instal·lat:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Disponible:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2005,28 +2119,34 @@ msgstr "" +@@ -2005,108 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." msgstr "" - "Alguna altra aplicació té el bloqueig del yum; s'està esperant a que " - "surti..." +-"Alguna altra aplicació té el bloqueig del yum; s'està esperant a que " +-"surti..." -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Alguna altra aplicació té el bloqueig del yum; s'està esperant a que surti..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -11051,285 +11141,296 @@ index cca37b7..0b69093 100644 msgid "" "\n" "\n" -@@ -2036,77 +2156,77 @@ msgstr "" - "\n" - "S'està sortint de l'ordre de l'usuari." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"S'està sortint de l'ordre de l'usuari." ++msgstr "\n\nS'està sortint de l'ordre de l'usuari." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() desapareixerà en una futura versió de Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" - msgstr "" - "S'està configurant TransactionSets abans que la classe de configuració " - "estigui iniciada" +-msgstr "" +-"S'està configurant TransactionSets abans que la classe de configuració " +-"estigui iniciada" ++msgstr "S'està configurant TransactionSets abans que la classe de configuració estigui iniciada" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Tsflag invàlid en el fitxer de configuració: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "S'està buscant pkgSack per a la dependència: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Membre: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s convertits per a instal·lar" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "S'està afegint el paquet %s en mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "S'està suprimint el paquet %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s requereix: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" - msgstr "" - "El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes" +-msgstr "" +-"El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes" ++msgstr "El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "El requeriment necessari no és un nom de paquet. S'està buscant: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Proveïdor potencial: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "El mode és %s per al proveïdor de %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Mode per al paquet que proporciona %s: %s" -@@ -2114,120 +2234,120 @@ msgstr "Mode per al paquet que proporciona %s: %s" +@@ -2114,1032 +2171,1029 @@ msgstr "Mode per al paquet que proporciona %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: el paquet %s requereix %s marcat per a suprimir" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències." +-msgstr "" +-"TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències." ++msgstr "TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: S'està actualitzant %s per a resoldre dependències." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "No es pot trobar un camí d'actualització de dependències per a: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "La coincidència %s es requereix per a %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està" - " suprimint." +-msgstr "" +-"%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està" +-" suprimint." ++msgstr "%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està suprimint." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "El paquet potencial que resol dependències %s té una instància nova a ts" +-msgstr "" +-"El paquet potencial que resol dependències %s té una instància nova a ts" ++msgstr "El paquet potencial que resol dependències %s té una instància nova a ts" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "El paquet potencial que resol dependències %s té una nova instància " - "insta·lada." +-msgstr "" +-"El paquet potencial que resol dependències %s té una nova instància " +-"insta·lada." ++msgstr "El paquet potencial que resol dependències %s té una nova instància insta·lada." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s ja es troba en ts, s'està ometent" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: S'està marcant %s com a actualització per a %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: S'està marcant %s com a instal·lació per a %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Èxit - transacció buida" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "S'està recomençant el bucle" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Està acabant el procés de dependències" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Èxit - dependències resoltes" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "S'estan comprobant les dependències per a %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "s'està buscant %s com a requeriment de %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "S'està executant compare_providers() per a %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "millor arq en el po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s fa obsolet %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2236,142 +2356,142 @@ msgstr "" - "archdist ha comparat %s amb %s a %s\n" - " Ha guanyat: %s" + " Winner: %s" +-msgstr "" +-"archdist ha comparat %s amb %s a %s\n" +-" Ha guanyat: %s" ++msgstr "archdist ha comparat %s amb %s a %s\n Ha guanyat: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "rpm font comú %s i %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefix comú de %s entre %s i %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Millor ordre: %s" @@ -11462,9 +11563,10 @@ index cca37b7..0b69093 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2379,21 +2499,21 @@ msgstr "" - "Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-" - "complete-transaction abans per acabar-les." +-msgstr "" +-"Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-" +-"complete-transaction abans per acabar-les." ++msgstr "Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-complete-transaction abans per acabar-les." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -11488,9 +11590,10 @@ index cca37b7..0b69093 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2401,130 +2521,122 @@ msgstr "" - "\n" - "Paquets omesos degut a problemes de dependències:" +-msgstr "" +-"\n" +-"Paquets omesos degut a problemes de dependències:" ++msgstr "\nPaquets omesos degut a problemes de dependències:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -11524,9 +11627,10 @@ index cca37b7..0b69093 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals " - "durant la transacció." +-msgstr "" +-"Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals " +-"durant la transacció." ++msgstr "Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals durant la transacció." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -11548,7 +11652,7 @@ index cca37b7..0b69093 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "S'havia d'instal·lar %s però no s'ha realitzat!" @@ -11559,24 +11663,22 @@ index cca37b7..0b69093 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "S'havia de suprimir %s però no s'ha realitzat!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "No s'ha pogut comprovar si el PID %s es troba actiu" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "No s'ha pogut comprovar si el PID %s es troba actiu" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -11586,13 +11688,25 @@ index cca37b7..0b69093 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "No s'ha pogut comprovar si el PID %s es troba actiu" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -11600,25 +11714,26 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "No s'ha pogut realitzar la suma de verificació" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "No coincideix la suma de verificació del paquet" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "la suma de verificació del paquet falla però l'ús de memòria cau està " - "habilitat per a %s" +-msgstr "" +-"la suma de verificació del paquet falla però l'ús de memòria cau està " +-"habilitat per a %s" ++msgstr "la suma de verificació del paquet falla però l'ús de memòria cau està habilitat per a %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "s'està utilitzant la còpia local de %s" @@ -11635,69 +11750,70 @@ index cca37b7..0b69093 100644 -" * necessari %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "La capçalera no està completa." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2532,62 +2644,64 @@ msgstr "" - "La capçalera no es troba en la memòria cau local i està habilitat el mode de" - " només memòria cau. No es pot baixar %s" +-msgstr "" +-"La capçalera no es troba en la memòria cau local i està habilitat el mode de" +-" només memòria cau. No es pot baixar %s" ++msgstr "La capçalera no es troba en la memòria cau local i està habilitat el mode de només memòria cau. No es pot baixar %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "La clau pública per a %s no està instal·lada" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Hi ha hagut un problema obrint el paquet %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "La clau pública per a %s no és de confiança" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "El paquet %s no està signat" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "No es pot suprimir %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "S'ha suprimit %s" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "No es pot suprimir %s fitxer %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s fitxer %s suprimit" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fitxers suprimits" @@ -11707,28 +11823,29 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Hi ha més d'una coincidència idèntica en el sac per a %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "No hi ha coincidències %s.%s-%s:%s-%s de l'actualització" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2595,143 +2709,146 @@ msgstr "" - "searchPackages() desapareixerà en una futura versió de Yum." - " Useu searchGenerator(). \n" +-msgstr "" +-"searchPackages() desapareixerà en una futura versió de Yum." +-" Useu searchGenerator(). \n" ++msgstr "searchPackages() desapareixerà en una futura versió de Yum. Useu searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "S'estan buscant %d paquets" @@ -11738,63 +11855,64 @@ index cca37b7..0b69093 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "s'està buscant el paquet %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "s'està buscant en les entrades de fitxers" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "s'està buscant en les entrades proporcionades" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" - msgstr "" - "No hi ha dades de grup disponibles en cap dels repositoris configurats" +-msgstr "" +-"No hi ha dades de grup disponibles en cap dels repositoris configurats" ++msgstr "No hi ha dades de grup disponibles en cap dels repositoris configurats" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "No existeix cap grup anomenat %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "el paquet %s no estava marcat en el grup %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "S'està afegint el paquet %s del grup %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "No hi ha cap paquet anomenat %s disponible per a ser instal·lat" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -11802,81 +11920,82 @@ index cca37b7..0b69093 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "No s'ha pogut trobar la tupla de paquets %s al sac de paquets" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "No s'ha trobat cap paquet per a %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "L'objecte paquet no era una instància d'objecte paquet" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "No hi ha res especificat per a instal·lar" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" - msgstr "" - "S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a " - "%s" +-msgstr "" +-"S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a " +-"%s" ++msgstr "S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "No hi ha cap coincidència per a l'argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "El paquet %s es troba instal·lat però no és disponible" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "No hi ha cap paquet disponible per a instal·lar" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "El paquet: %s - ja està en la transacció" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "El paquet %s és obsolet degut a %s, que ja està instal·lat" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -11884,66 +12003,68 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s en el seu " - "lloc" +-msgstr "" +-"El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s en el seu " +-"lloc" ++msgstr "El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s en el seu lloc" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "El paquet %s ja es troba instal·lat i en l'última versió." -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" -@@ -2739,66 +2856,72 @@ msgstr "" - "actualització." +-msgstr "" +-"El paquet coincident %s ja es troba instal·lat. S'està buscant una " +-"actualització." ++msgstr "El paquet coincident %s ja es troba instal·lat. S'està buscant una actualització." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "S'està actualitzant tot" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "No s'actualitzarà el paquet obsolet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "El paquet és obsolet: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "No s'actualitzarà el paquet obsolet: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "No s'actualitzarà el paquet actualitzat: %s.%s %s:%s-%s" @@ -11951,67 +12072,70 @@ index cca37b7..0b69093 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "No hi ha cap paquet coincident per a suprimir" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "S'està examinant %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2806,12 +2929,12 @@ msgstr "" - "No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura " - "compatible: %s" +-msgstr "" +-"No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura " +-"compatible: %s" ++msgstr "No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura compatible: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2820,140 +2943,147 @@ msgstr "" - "El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum " - "install» per a instal·lar-lo." + "instead." +-msgstr "" +-"El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum " +-"install» per a instal·lar-lo." ++msgstr "El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum install» per a instal·lar-lo." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -12019,121 +12143,123 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "S'està excloent %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "S'està marcant %s per a ser instal·lat" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "S'està marcant %s com a actualització de %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s no actualitza el paquet instal·lat." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "No es pot obrir el fitxer %s. S'ometrà." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a suprimir" +-msgstr "" +-"Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a suprimir" ++msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a suprimir" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Hi ha un problema en reinstal·lar: no hi ha cap paquet %s marcat per a " - "instal·lar" +-msgstr "" +-"Hi ha un problema en reinstal·lar: no hi ha cap paquet %s marcat per a " +-"instal·lar" ++msgstr "Hi ha un problema en reinstal·lar: no hi ha cap paquet %s marcat per a instal·lar" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "No hi ha cap paquet disponible per a desactualitzar" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "El paquet %s permet múltiples instal·lacions, s'està ometent" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "No hi ha cap paquet disponible que coincideixi: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Només hi ha una actualització disponible per al paquet: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "La recuperació de la clau GPG ha fallat: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "L'ànalisi de la clau GPG ha fallat: la clau no té el valor %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -12147,7 +12273,7 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -12159,60 +12285,62 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "La clau GPG de %s (0x%s) ja està instal·lada" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "La importació de la clau ha fallat (codi %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "La clau s'ha importat amb èxit" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2962,184 +3092,208 @@ msgstr "" - "Les claus GPG llistades per al repositori \"%s\" ja estan instal·lades però no són correctes per a aquest paquet.\n" - "Comproveu que les URL de claus correctes estan configurades per a aquest repositori." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Les claus GPG llistades per al repositori \"%s\" ja estan instal·lades però no són correctes per a aquest paquet.\n" +-"Comproveu que les URL de claus correctes estan configurades per a aquest repositori." ++msgstr "Les claus GPG llistades per al repositori \"%s\" ja estan instal·lades però no són correctes per a aquest paquet.\nComproveu que les URL de claus correctes estan configurades per a aquest repositori." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "La importació de claus no ha ajudat, eren claus incorrectes?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "La clau GPG a %s (0x%s) ja ha estat importada" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Ha fallat la importació de la clau" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -12220,117 +12348,117 @@ index cca37b7..0b69093 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "No s'ha pogut trobar un servidor rèplica vàlid." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "S'han trobat errors baixant paquets." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Siusplau, informeu d'aquest error al %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Errors en la transacció de prova: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -12382,9 +12510,10 @@ index cca37b7..0b69093 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca" - " de connectors" +-msgstr "" +-"Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca" +-" de connectors" ++msgstr "Existeixen dos o més connectors amb el mateix nom \"%s\" en el camí de cerca de connectors" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -12432,29 +12561,48 @@ index cca37b7..0b69093 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3148,6 +3302,17 @@ msgstr "" +@@ -3148,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "Reempaquetant" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"No hi ha espai suficient al directori de descàrregues %s\n" -+" * lliure %s\n" -+" * necessari %s" ++msgstr "No hi ha espai suficient al directori de descàrregues %s\n * lliure %s\n * necessari %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3160,9 +3227,7 @@ msgstr "Falla la comprobació md5 per al RPM %s" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en " +-"ús?" ++msgstr "No s'ha pogut obrir la base de dades RPM per a llegir-la. Potser ja està en ús?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3178,5 +3243,3 @@ msgstr "Capçalera malmesa %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "S'ha produït un error en obrir l'rpm %s - error %s" +- +- diff --git a/po/cs.po b/po/cs.po -index 622394b..19b1b6f 100644 +index 622394b..f8eb47f 100644 --- a/po/cs.po +++ b/po/cs.po -@@ -2,14 +2,16 @@ +@@ -2,1515 +2,1581 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -12465,22 +12613,24 @@ index 622394b..19b1b6f 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Czech (http://www.transifex.net/projects/p/yum/team/cs/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Czech (http://www.transifex.net/projects/p/yum/team/cs/)\n" ++"Language-Team: Czech (http://www.transifex.net/projects/p/yum/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +19,125 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" -msgstr "Aktualizuje se" +msgstr "Aktualizace" @@ -12493,33 +12643,33 @@ index 622394b..19b1b6f 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" -msgstr "Instaluje se" +msgstr "Instalování" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" -msgstr "Zastaralé" +msgstr "Zastaralo" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Aktualizováno" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Smazáno" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Nainstalováno" @@ -12546,7 +12696,7 @@ index 622394b..19b1b6f 100644 msgstr "Smazáno: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Odstraňuje se" @@ -12557,190 +12707,192 @@ index 622394b..19b1b6f 100644 +msgstr "Vymazání" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Příkaz „%s“ již definován" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" -msgstr "Nastavují se repozitáře" +msgstr "Příprava repozitářů" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" -msgstr "Načítají se metadata repozitářů z lokálních souborů" +msgstr "Načítání metadat repozitářů z lokálních souborů" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Chyba konfigurace: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Chybná volba: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Nainstalováno: %s-%s na %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Sestaveno : %s na %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Odesláno : %s na %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" -msgstr "Musíte zadat nějaký příkaz" +msgstr "Musít být zadán nějaký příkaz" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Neexistující příkaz: %s. Použijte %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Diskové požadavky:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Je potřeba alespoň o %dMB více místa na souborovém systému %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] " Je potřeba alespoň o %dMB více místa na souborovém systému %s.\n" -+msgstr[1] " Je potřeba alespoň o %dMB více místa na souborovém systému %s.\n" ++msgstr[0] "" ++msgstr[1] "" +msgstr[2] " Je potřeba alespoň o %dMB více místa na souborovém systému %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,60 +145,60 @@ msgstr "" - "Přehled chyb\n" - "------------\n" +-msgstr "" +-"Přehled chyb\n" +-"------------\n" ++msgstr "Přehled chyb\n------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Pokus o spuštění transakce, ale není co dělat. Ukončeno." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Ukončeno na příkaz uživatele" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" -msgstr "Stahují se balíčky:" +msgstr "Stahování balíčků:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" -msgstr "Chyba stahování balíčků:\n" +msgstr "Chyba při stahování balíčků:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" -msgstr "" +msgstr "Spuštěna kontrola transakce" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "CHYBA Je potřeba aktualizovat rpm k provedení:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" -msgstr "" +msgstr "CHYBA při kontrole transakce a řešení závislostí:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" -msgstr "Je potřeba aktualizovat RPM" +msgstr "Je nutné aktualizovat RPM" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" -msgstr "Oznamte prosím tuto chybu v %s" +msgstr "Oznamte prosím tuto chybu na adrese %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" -msgstr "Spouští se test transakcí" +msgstr "Spuštěn test transakce" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" -msgstr "Chyba při kontrole transakcí:\n" +msgstr "Chyba při kontrole transakce:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" -msgstr "Test transakcí uspěl" +msgstr "Test transakce v pořádku" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" -msgstr "Spouští se transakce" +msgstr "Transakce spuštěna" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -201,234 +206,269 @@ msgstr "" - "Nelze automaticky importovat klíče při spuštění bez obsluhy.\n" - "Použijte \"-y\" k potlačení." +-msgstr "" +-"Nelze automaticky importovat klíče při spuštění bez obsluhy.\n" +-"Použijte \"-y\" k potlačení." ++msgstr "Nelze automaticky importovat klíče při spuštění bez obsluhy.\nPoužijte \"-y\" k potlačení." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " -msgstr " * Možná jste myslel: " +msgstr " * Možná bylo míněno: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Balíček(y) %s%s%s dostupný/é, ale nenainstalovaný/é." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Balíček %s%s%s není dostupný." @@ -12748,7 +12900,7 @@ index 622394b..19b1b6f 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Balíček(y) k instalaci" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -12758,13 +12910,13 @@ index 622394b..19b1b6f 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Není co dělat" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d balíčků označeno k aktualizaci" @@ -12775,13 +12927,13 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" -msgstr "Žádné balíčky označené k aktualizaci" +msgstr "Nejsou dostupné žádné balíčky s aktualizacemi" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d balíčků označených k synchronizaci distribuce" @@ -12792,13 +12944,13 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" -msgstr "K synchronizaci distribuce nebyly označeny žádné balíčky" +msgstr "K synchronizaci distribuce nebyly určeny žádné balíčky" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d balíčků označeno ke smazání" @@ -12809,7 +12961,7 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" -msgstr "Žádné balíčky označené k odstranění" +msgstr "Žádné balíčky ke smazání" @@ -12817,7 +12969,7 @@ index 622394b..19b1b6f 100644 -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Balíček(y) ke snížení verze" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -12826,13 +12978,13 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (z %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." -msgstr "Instalované balíčky %s%s%s%s nejsou dostupné" @@ -12841,7 +12993,7 @@ index 622394b..19b1b6f 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Balíček(y) k reinstalaci" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -12850,172 +13002,171 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" -msgstr "Žádný balíček neposkytuje" +msgstr "Neposkytnuty žádné balíčky" + -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Balíček(y) k instalaci" -#: ../cli.py:1058 -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" -msgstr "" +msgstr "Jméno/Souhrn odpovídá: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" Vyhledáno %spouze%s podle jména a souhrnu, použijte \"search all\" pro " -+"úplné hledání." +-msgstr "" ++msgstr " Vyhledáno %spouze%s podle jména a souhrnu, použijte \"search all\" pro úplné hledání." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" Vyhledáno %spouze%s podle plného jména a souhrnu, použijte \"search all\" " -+"pro úplné hledání." +-msgstr "" ++msgstr " Vyhledáno %spouze%s podle plného jména a souhrnu, použijte \"search all\" pro úplné hledání." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Shoda: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." -msgstr "" +msgstr " Vyhledáno %shlavně%s, použijte \"search all\" pro úplné hledání." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" -msgstr "Varování: Žádný balíček odpovídající: %s" +msgstr "Varování: Žádná shoda pro: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Nebyla nalezena shoda" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nebyly nalezeny balíčky pro %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " -msgstr "Čištění repozitářů:" +msgstr "Vyčištění repozitářů:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" -msgstr "Čistí se vše" +msgstr "Vymazání celého obsahu cache" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" -msgstr "Čistí se hlavičky" +msgstr "Vymazání hlaviček" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" -msgstr "Čistí se balíčky" +msgstr "Vymazání balíčků" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" -msgstr "Čistí se XML metadata" +msgstr "Vymazání XML metadat" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" -msgstr "Čistí se skladiště databáze" +msgstr "Vymazání databázové cache" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" -msgstr "Ze skladiště se odstraňují zastaralá metadata" +msgstr "Vymazání zastaralých metadat" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" -msgstr "Čistí se skladiště rpmdb dat" +msgstr "Vymazání rpmdb cache" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" -msgstr "Čistí se zásuvné moduly" +msgstr "Vymazání modulů" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "Varování: Žádná shoda skupiny pro: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Nainstalované skupiny:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" -msgstr "" +msgstr "Nainstalované jazykové skupiny:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Dostupné skupiny:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" -msgstr "" +msgstr "Dostupné jazykové skupiny:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Dokončeno" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Varování: skupina %s neexistuje." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "V žádné z požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci" +-msgstr "" +-"V žádné z požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci" ++msgstr "V žádné z požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d balíček(ů) k instalaci" @@ -13026,18 +13177,18 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Neexistuje skupina se jménem %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Žádné balíčky k odstranění ve skupině" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d balíček(ů) k odstranění" @@ -13048,13 +13199,13 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Balíček %s je již nainstalován, přeskakuje se" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" -msgstr "Skartuje se neporovnatelný balíček %s.%s" @@ -13062,642 +13213,652 @@ index 622394b..19b1b6f 100644 #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Žádný jiný %s nainstalován, přidán do seznamu k potenciální instalaci" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" -msgstr "Možnosti zásuvného modulu" +msgstr "Volby zásuvného modulu" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" -msgstr "Chyba příkazové řádky: %s" +msgstr "Chyba na příkazovém řádku: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -439,284 +479,288 @@ msgstr "" "\n" - "%s: %s volba vyžaduje argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s volba vyžaduje argument" ++msgstr "\n\n%s: %s volba vyžaduje argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" -msgstr "--color přijímá jeden z: auto, always, never" +msgstr "--color může být jen: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot musí být absolutní cesta: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "ukázat tuto nápovědu a skončit" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "tolerovat chyby" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" -msgstr "spustit vše ze systémového skladiště, bez jeho aktualizace" +msgstr "spustit vše ze systémové cache, bez její aktualizace" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "umístění konfiguračního souboru" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maximální čas čekání na příkaz" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" -msgstr "úroveň výstupních ladících informací" +msgstr "úroveň výpisu ladících informací" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "ukázat duplikáty v repozitářích, v list/search příkazech" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" -msgstr "úroveň výstupu chyb" +msgstr "úroveň výpisu chyb" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" -msgstr "úroveň výstupních ladících informací pro rpm" +msgstr "úroveň výpisu ladících informací pro rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" -msgstr "tichý chod" +msgstr "tichý běh" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" -msgstr "užvaněný chod" +msgstr "užvaněný běh" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" -msgstr "odpovědět ano na všechny otázky" +msgstr "odpovědět na všechny otázky ano" + -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "ukázat verzi yumu a skončit" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "nastavit kořen instalace " -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "povolit jeden nebo více repozitářů (zástupné znaky povoleny)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "zakázat jeden nebo více repozitářů (zástupné znaky povoleny)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" -msgstr "vyřadit balíček(y) podle jména nebo globálně" +msgstr "vyřadit balíček(y) podle jména nebo výrazu" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "zakázat vyřazení z hlavní části, pro repozitář nebo pro vše" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "povolit zpracování zastaralých během aktualizací" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "zakázat zásuvné moduly yumu" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "zakázat kontrolu GPG podpisů" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "zakázat zásuvné moduly podle jména" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "povolit zásuvné moduly podle jména" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "přeskočit balíčky s problémy v závislostech" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontrola zda jsou použity barvy" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" -msgstr "nastavte hodnotu $releasever v konfiguraci yumu a repo souborech" +msgstr "nastavit hodnotu $releasever pro yum a repo soubory" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "nastavit doplňkové konfigurace a možnosti repozitáře " -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" -msgstr "Led" +msgstr "led" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" -msgstr "Úno" +msgstr "úno" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" -msgstr "Bře" +msgstr "bře" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" -msgstr "Dub" +msgstr "dub" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" -msgstr "Kvě" +msgstr "kvě" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" -msgstr "Čer" +msgstr "čer" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" -msgstr "Čec" +msgstr "čec" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" -msgstr "Srp" +msgstr "srp" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" -msgstr "Zář" +msgstr "zář" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" -msgstr "Říj" +msgstr "říj" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" -msgstr "Lis" +msgstr "lis" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" -msgstr "Pro" +msgstr "pro" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." -msgstr "Zkouší se jiné zrcadlo" +msgstr "Zkusí se jiné zrcadlo..." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" -msgstr "Jméno : %s%s%s" +msgstr "Jméno : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" -msgstr "Arch : %s" +msgstr "Platforma : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" -msgstr "Epocha : %s" +msgstr "Epocha : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" -msgstr "Verze : %s" +msgstr "Verze : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" -msgstr "Vydání : %s" +msgstr "Vydání : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" -msgstr "Velikost : %s" +msgstr "Velikost : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" -msgstr "Repo : %s" +msgstr "Repozitář : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" -msgstr "Z repozitáře: %s" +msgstr "Z repozitáře : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" -msgstr "Odesilatel : %s" +msgstr "Odesilatel : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" -msgstr "Čas odeslání: %s" +msgstr "Čas odeslání : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" -msgstr "Čas sestavení: %s" +msgstr "Čas vytvoření: %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Čas instalace: %s " -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" -msgstr "Nainstaloval: %s " +msgstr "Nainstaloval : %s " -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" -msgstr "Změnil : %s" +msgstr "Změnil : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " -msgstr "Souhrn : " +msgstr "Souhrn : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" -msgstr "URL : %s" +msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " -msgstr "Licence : " +msgstr "Licence : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " -msgstr "Popis : " +msgstr "Popis : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "a" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ano" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ne" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "V pořádku [a/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -725,154 +769,157 @@ msgstr "" - "\n" - "Skupina: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Skupina: %s" ++msgstr "\nSkupina: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " ID skupiny: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Popis: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr " Jazyk: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Povinné balíčky:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Výchozí balíčky:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Volitelné balíčky:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Podmínečné balíčky:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" -msgstr "balíčky: %s" +msgstr "balíček: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" -msgstr " Pro tento balíček nejsou žádné závislosti" +msgstr " Pro balíček nejsou žádné závislosti" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" -msgstr " závislosti: %s" +msgstr " závislost: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" -msgstr " Neuspokojené závislosti" +msgstr " Nevyřešené závislosti" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Shoda s:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licence : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Soubor : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Další : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" -msgstr "Při výpočtu celkové velikosti stahování nastala chyba" +msgstr "Při výpočtu celkové velikosti ke stahování nastala chyba" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Celková velikost: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" -msgstr "Celková velikost stahování: %s" +msgstr "Celková velikost ke stahování: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Nainstalovaná velikost: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" -msgstr "Při počítání velikosti instalace došlo k chybě" +msgstr "Při výpočtu velikosti po instalaci došlo k chybě" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" -msgstr "Přeinstalovává se" +msgstr "Reinstalace" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" -msgstr "Snižuje se verze" +msgstr "Snížení verze" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" -msgstr "Instaluje se kvůli závislostem" +msgstr "Instalace kvůli závislostem" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" -msgstr "Aktualizuje se kvůli závislostem" +msgstr "Aktualizace se kvůli závislostem" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" -msgstr "Odstraňuje se kvůli závislostem" +msgstr "Odstranění kvůli závislostem" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Přeskočeno (problémy se závislostmi)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Nenainstalováno" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Nedostupný" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Balíček" +msgid_plural "Packages" -+msgstr[0] "Balíček" ++msgstr[0] "" +msgstr[1] "" -+msgstr[2] "" ++msgstr[2] "Balíček" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arch" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Verze" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repozitář" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Vel." -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " nahrazuje se %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -883,65 +930,67 @@ msgstr "" - "Shrnutí transakce\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Shrnutí transakce\n" +-"%s\n" ++msgstr "\nShrnutí transakce\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalace %5.5s balíčků\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Instalovat" @@ -13705,7 +13866,7 @@ index 622394b..19b1b6f 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Aktualizace %5.5s balíčků\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -13713,7 +13874,7 @@ index 622394b..19b1b6f 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Odstranění %5.5s balíčků\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -13721,7 +13882,7 @@ index 622394b..19b1b6f 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalace %5.5s balíčků\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Přeinstalovat" @@ -13729,11 +13890,11 @@ index 622394b..19b1b6f 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Snížení verze %5.5s balíčků\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Snížit verzi" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" @@ -13741,38 +13902,38 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Odstraněno" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Odstraněné závislosti" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Nainstalované závislosti" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Aktualizované závislosti" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Nahrazeno" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Selhalo" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" -msgstr "dvě" +msgstr "dvou" @@ -13782,283 +13943,287 @@ index 622394b..19b1b6f 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -952,364 +1001,416 @@ msgstr "" - "Aktuální stahování zrušeno, běh lze ukončit %sopakovaným přerušením (ctrl-c)%s\n" - "během %s%s%s sekund.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-"Aktuální stahování zrušeno, běh lze ukončit %sopakovaným přerušením (ctrl-c)%s\n" +-"během %s%s%s sekund.\n" ++msgstr "\nAktuální stahování zrušeno, běh lze ukončit %sopakovaným přerušením (ctrl-c)%s\nběhem %s%s%s sekund.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "Přerušeno uživatelem" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Celkem" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Systém" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "Vynechání sloučené transakce %d až %d, protože jsou v překryvu" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "" +msgstr "Žádné transakce" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Zadáno špatné ID transakce nebo balíčku/ů" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "Příkazový řádek" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" -msgstr "Přihlášení uživatele" +msgstr "Přihlášen uživatel" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Datum a čas" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Akce" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Pozměněno" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Nezadáno ID transakce" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Špatné ID transakce" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Zadané ID transakce nenalezeno" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Nalezeno více než jedno ID transakce!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Nebylo zadáno ID transakce nebo balíčku/ů" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Snížena verze" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Starší" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Novější" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "ID transakce:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Počáteční čas :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Začátek rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u sekund)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u minut)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u hodin)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u dnů)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" -msgstr "Konečný čas :" +msgstr "Čas ukončení :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Konec rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Uživatel :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Návratový kód :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Přerušeno" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" -msgstr "" +msgstr "Selhání:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Selhalo:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" -msgstr "Úspěch" +msgstr "Úspěšné" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" -msgstr "Příkazová řádka:" +msgstr "Příkazový řádek:" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Uložená přídavná nestandardní informace: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transakce proběhla s:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Pozměněné balíčky:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Přeskočené balíčky:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problémy rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Výstup skriptletu:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Chyby:" @@ -14067,17 +14232,17 @@ index 622394b..19b1b6f 100644 -msgstr "Instalovat" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Instalovat závislosti" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Zastaralé" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Smazat" @@ -14090,314 +14255,328 @@ index 622394b..19b1b6f 100644 -msgstr "Snížit verzi" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Aktualizovat" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Čas" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Poslední den" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Poslední týden" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Poslední 2 týdny" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Poslední 3 měsíce" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Posledních 6 měsíců" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Poslední rok" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Více než rok" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Nenalezena transakce %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "ID transakce:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Další dostupná informace z historie:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Nenalezena další data toho jména" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" -msgstr "instalaci" +msgstr "instalován" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" -msgstr "" +msgstr "novou aktualizací" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" -msgstr "smazání" +msgstr "smazán" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" -msgstr "reinstalaci" +msgstr "reinstalován" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" -msgstr "" +msgstr "ponížen" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" -msgstr "" +msgstr "nahrazen" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" -msgstr "aktualizaci" +msgstr "aktualizován" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" -msgstr "zastarání" +msgstr "zastaralý" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> Balíček %s.%s %s:%s-%s bude %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" -msgstr "--> Spouští se kontrola transakce" +msgstr "--> Kontrola transakce spuštěna" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." -msgstr "--> Restartuje se řešení závislostí s novými změnami." +msgstr "--> Restartování řešení závislostí s novými změnami." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Řešení závislostí dokončeno" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" -msgstr "--> Zpracování závislosti: %s pro balíček: %s" +msgstr "--> Zpracování závislostí: %s pro balíček: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" -msgstr "---> Ponechají se balíčky: %s" +msgstr "---> Ponechíní balíčku: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" -msgstr "--> Nevyřešená závislost: %s" +msgstr "--> Nevyřešené závislosti: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Balíček: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1318,7 +1419,7 @@ msgstr "" - "\n" - " Vyžaduje: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Vyžaduje: %s" ++msgstr "\n Vyžaduje: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1327,7 +1428,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1336,7 +1437,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1345,85 +1446,85 @@ msgstr "" - " Nenalezeno" +-msgstr "" +-"\n" +-" Nenalezeno" ++msgstr "\n Nenalezeno" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" -msgstr "Aktualizoval" +msgstr "Aktualizací balíčku" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Snížil verzi" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" -msgstr "Zastaral" +msgstr "Zastaralán" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Dostupné" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Zpracování konfliktu: %s je v konfliktu s %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." -msgstr "--> Do transakční sady se přidávají vybrané balíčky. Čekejte prosím." +msgstr "--> Do transakce jsou přidávány vybrané balíčky. Čekejte prosím." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." -msgstr "---> Stahují se hlavičky %s pro přidání do transakce." +msgstr "---> Stahování hlaviček %s pro přidání do transakce." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Běží" @@ -14423,7 +14602,7 @@ index 622394b..19b1b6f 100644 msgstr "Trasován/Zastaven" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Neznámý" @@ -14462,43 +14641,47 @@ index 622394b..19b1b6f 100644 msgid "" "\n" "\n" -@@ -1431,9 +1532,9 @@ msgid "" - msgstr "" - "\n" - "\n" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" -"Ukončeno na základě pokynu uživatele" -+"Ukončeno na příkaz uživatele" ++msgstr "\n\nUkončeno na příkaz uživatele" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1441,9 +1542,9 @@ msgid "" - msgstr "" - "\n" - "\n" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" -"Ukončeno kvůli nefunkční rouře" -+"Ukončeno přerušením roury" ++msgstr "\n\nUkončeno přerušením roury" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1454,63 +1555,63 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" - msgstr "" +-msgstr "" -"Zámek aplikace yum je uzamčen jinou aplikací; ukončeno dle konfigurace " -+"Zámek pro yum nyní blokuje jiná aplikace; ukončení kvůli nastavenému " - "exit_on_lock" +-"exit_on_lock" ++msgstr "Zámek pro yum nyní blokuje jiná aplikace; ukončení kvůli nastavenému exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -14540,10 +14723,10 @@ index 622394b..19b1b6f 100644 msgid "" "\n" "Dependencies Resolved" - msgstr "" - "\n" +-msgstr "" +-"\n" -"Závislosti vyřešeny" -+"Závislosti vyřešeny." ++msgstr "\nZávislosti vyřešeny." -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 @@ -14565,22 +14748,24 @@ index 622394b..19b1b6f 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1527,9 +1628,9 @@ msgid "" - "For more information contact your distribution or package provider.\n" - msgstr "" +@@ -1525,1609 +1591,1644 @@ msgid "" + "will install it for you.\n" "\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" -"Povolili jste kontrolu balíčků pomocí GPG klíčů, což je dobrá věc.\n" -"Bohužel nemáte ale nainstalován žádný veřejný GPG klíč. Musíte stáhnout klíč\n" -"pro balíček, který si přejete nainstalovat a přidat jej příkazem\n" -+"Je povolena kontrola balíčků pomocí GPG klíčů, což je dobrá věc.\n" -+"Není však nainstalován žádný veřejný GPG klíč. Musíte stáhnout\n" -+"klíč pro balíček, který si přejete nainstalovat a přidat jej příkazem\n" - " rpm --import public.gpg.key\n" - "\n" - "\n" -@@ -1539,362 +1640,351 @@ msgstr "" - "\n" - "Více informací získáte u svého distributora nebo správce balíčku.\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Jako druhou možnost můžete uvést URL ke klíči, který chcete použít\n" +-"pro repozitář ve volbě 'gpgkey' v nastavení repozitáře, a yum\n" +-"jej nainstaluje.\n" +-"\n" +-"Více informací získáte u svého distributora nebo správce balíčku.\n" ++msgstr "\nJe povolena kontrola balíčků pomocí GPG klíčů, což je dobrá věc.\nNení však nainstalován žádný veřejný GPG klíč. Musíte stáhnout\nklíč pro balíček, který si přejete nainstalovat a přidat jej příkazem\n rpm --import public.gpg.key\n\n\nJako druhou možnost můžete uvést URL ke klíči, který chcete použít\npro repozitář ve volbě 'gpgkey' v nastavení repozitáře, a yum\njej nainstaluje.\n\nVíce informací získáte u svého distributora nebo správce balíčku.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -14647,13 +14832,11 @@ index 622394b..19b1b6f 100644 "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" " You can enable repos with yum-config-manager --enable " - msgstr "" +-msgstr "" -"Neexistují žádné povolené repozitáře.\n" -" Abyste viděli povolené repozitáře spusťte \"yum repolist all\".\n" -" Povolit repozitáře můžete pomocí \"yum-config-manager --enable \"" -+"K dispozici nejsou žádné povolené repozitáře.\n" -+" Pro zobrazení repozitářů spusťte \"yum repolist all\".\n" -+" Repozitáře můžete povolit pomocí \"yum-config-manager --enable \"" ++msgstr "K dispozici nejsou žádné povolené repozitáře.\n Pro zobrazení repozitářů spusťte \"yum repolist all\".\n Repozitáře můžete povolit pomocí \"yum-config-manager --enable \"" -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -14762,12 +14945,12 @@ index 622394b..19b1b6f 100644 msgid "Setting up Remove Process" -msgstr "Uspořádává se průběh odstranění" +msgstr "Příprava průběhu odstranění" - --#: ../yumcommands.py:435 ++ +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" +msgstr "" -+ + +-#: ../yumcommands.py:435 +#: ../yumcommands.py:776 msgid "Setting up Group Process" -msgstr "Uspořádává se zpracování skupiny" @@ -14871,12 +15054,12 @@ index 622394b..19b1b6f 100644 +#: ../yumcommands.py:1393 msgid "Setting up Local Package Process" -msgstr "Uspořádává se zpracování lokálního balíčku" -+msgstr "Příprava zpracování lokálního balíčku" - +- -#: ../yumcommands.py:764 -msgid "Determine which package provides the given dependency" -msgstr "Určit který balíček poskytuje danou závislost" -- ++msgstr "Příprava zpracování lokálního balíčku" + -#: ../yumcommands.py:767 +#: ../yumcommands.py:1457 msgid "Searching Packages for Dependency:" @@ -14912,125 +15095,125 @@ index 622394b..19b1b6f 100644 msgstr "Zobrazit nastavené repozitáře softwaru" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "povoleno" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "zakázáno" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " -msgstr "Repo-id : " +msgstr "Repo-ID : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " -msgstr "Repo-jméno : " +msgstr "Repo-název : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Repo-revize : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-tagy : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-distro-tagy: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " -msgstr "Repo-aktuální: " +msgstr "Repo-aktual. : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " -msgstr "Repo-bal. : " +msgstr "Repo-balíčků : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Repo-velikost: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " -msgstr " Aktualizováno: " +msgstr "Aktualizováno: " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Repo-zrcadla : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Nikdy (poslední: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Okamžitě (naposledy: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekund (naposledy: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Repo-vyprší : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-vyřazeno: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-zahrnuto: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Repo-vyřazeno: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Repo-konfig : " @@ -15038,200 +15221,206 @@ index 622394b..19b1b6f 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" -msgstr "repo id" +msgstr "ID repozitáře:" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" -msgstr "status" +msgstr "Stav:" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" -msgstr "jméno repa" +msgstr "Název repozitáře:" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Zobrazit užitečnou nápovědu" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" -msgstr "Není dostupná nápověda pro %s" +msgstr "Pro %s není dostupná nápověda" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1904,7 +1994,7 @@ msgstr "" - "\n" - "aliasy: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"aliasy: " ++msgstr "\n\naliasy: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1914,115 +2004,161 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" -msgstr "Uspořádává se průběh reinstalace" +msgstr "Příprava průběhu reinstalace" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "Reinstalace balíčku" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" -msgstr "Uspořádává se průběh snížení verze" +msgstr "Příprava snížení verze" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "Snížení verze balíčku" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." -msgstr "Zobrazit verzi pro tento počítač a/nebo dostupné repozitáře." +msgstr "Zobrazit verzi pro počítač a/nebo dostupné repozitáře." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Verze yum skupin:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Skupina :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Balíčky :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Nainstalováno:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Nainstalované skupiny:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Dostupné:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Dostupné skupiny:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" -msgstr "Zobrazit nebo používat transakční historii" +msgstr "Zobrazit nebo používat historii transakcí" + -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." -msgstr "Neplatný pod-příkaz historie, použijte: %s." +msgstr "Neplatný subpříkaz historie, použijte: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Nemáte přístup k databázi s historií." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Zkontrolovat problémy v rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "" +msgstr "Načíst transakci uloženou v souboru" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nebyla zadána žádná uložená transakce." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "načítání transakce z %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -15283,103 +15472,106 @@ index 622394b..19b1b6f 100644 msgid "" "\n" "\n" -@@ -2032,448 +2168,451 @@ msgstr "" - "\n" - "Ukončeno na pokyn uživatele." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Ukončeno na pokyn uživatele." ++msgstr "\n\nUkončeno na pokyn uživatele." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() bude v následujících verzích yumu odstraněno.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" -msgstr "" -"Uspořádává se TransactionSet před tím než bude připravena třída config" +msgstr "Příprava TransactionSet před tím než bude připravena třída config" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Neplatný tsflag v konfiguračním souboru: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" -msgstr "Hledá se pkgSack pro závislost: %s" +msgstr "Hledání pkgSack pro závislost: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" -msgstr "Prvek: %s" +msgstr "Člen: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" -msgstr "%s zkonvertován na instalaci" +msgstr "%s zkonvertován pro instalaci" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" -msgstr "Přidává se balíček %s v módu %s" +msgstr "Přidání balíčeku %s v režimu %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" -msgstr "Odstraňuje se balíček %s" +msgstr "Odstranění balíčku %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s vyžaduje: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s vyžaduje %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" -msgstr "Závazné požadavky již byly prohledány, švindluje se" +msgstr "Potřebné Require již bylo vyhledáno, švindluje se" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" -msgstr "Závazný požadavek není jméno balíčku. Hledá se: %s" +msgstr "Potřebné Require není jméno balíčku. Hledání: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Možný poskytovatel: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" -msgstr "Mód je %s pro poskytovatele %s: %s" +msgstr "Režim %s pro poskytovatele %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" -msgstr "Mód pro bal. poskytující %s: %s" @@ -15389,51 +15581,49 @@ index 622394b..19b1b6f 100644 #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Pro vyřešení závislostí se zkouší aktualizace %s" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "Není cesta pro aktualizaci %s. Selhání!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" -msgstr "TSINFO: %s balíček požaduje %s označený ke smazání" +msgstr "TSINFO: balíček %s požaduje %s, který je určen ke smazání" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." -msgstr "TSINFO: Zastarává se %s s %s k vyřešení závislostí." -+msgstr "" -+"TSINFO: Balíček %s je označen za zastaralý balíčkem %s pro vyřešení " -+"závislostí." ++msgstr "TSINFO: Balíček %s je označen za zastaralý balíčkem %s pro vyřešení závislostí." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." -msgstr "TSINFO: Aktualizuji %s k vyřešení závislostí." +msgstr "TSINFO: Aktualizace %s pro vyřešení závislostí." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" -msgstr "Nelze nalézt cestu aktualizací pro závislost pro: %s" +msgstr "Nelze nalézt cestu aktualizací pro závislosti pro: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" -msgstr "Rychlá shoda %s vyžadovaného pro %s" @@ -15441,152 +15631,153 @@ index 622394b..19b1b6f 100644 #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se." +-msgstr "" +-"%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se." ++msgstr "%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." -msgstr "Balíček %s, který může být řešení, má v ts novější verzi." +msgstr "Balíček %s, který může být řešením, má v transakci novější verzi." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." -msgstr "Balíček %s, který může být řešení, je nainstalován v novější verzi." +msgstr "Balíček %s, který může být řešením, je nainstalován v novější verzi." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" -msgstr "%s je již v ts, vynechává se" +msgstr "%s je již v transakci, vynechává se" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" -msgstr "TSINFO: Označuji %s jako aktualizaci %s" +msgstr "TSINFO: Označení %s jako aktualizaci pro %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" -msgstr "TSINFO: Označuji %s jako instalaci %s" +msgstr "TSINFO: Označení %s jako instalaci pro %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Úspěch - prázdná transakce" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" -msgstr "Restartuje se smyčka" +msgstr "Restartování smyčky" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" -msgstr "Proces zpracování závislostí končí" +msgstr "Proces zpracování závislostí skončil" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Úspěch - závislosti vyřešeny" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" -msgstr "Kontroluji závislosti pro %s" +msgstr "Kontrola závislostí pro %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" -msgstr "hledá se %s jako požadavek od %s" +msgstr "hledá se %s jako požadavek pro %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" -msgstr "Spouští se compare_providers() pro %s" +msgstr "Spuštěno compare_providers() pro %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "lepší architektura v po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s zastarává %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" " Winner: %s" - msgstr "" +-msgstr "" -"archdist porovnán pro %s k %s na %s\n" -+"archdist porovnal %s vůči %s na %s\n" - " Vítěz: %s" +-" Vítěz: %s" ++msgstr "archdist porovnal %s vůči %s na %s\n Vítěz: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "společné zdrojové rpm %s a %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "základní balíček %s je nainstalován pro %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "společný prefix %s mezi %s a %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "vyžaduje minimálně: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Vítěz: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" -msgstr " Poražený (kým %d): %s" +msgstr " Poražený (%d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" -msgstr "Nejlepší pořádek: %s" @@ -15734,11 +15925,10 @@ index 622394b..19b1b6f 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." - msgstr "" +-msgstr "" -"Existují nedokončené transakce. Měli byste zvážit možnost nejdříve spustit " -"yum-complete-transaction k jejich dokončení." -+"Existují nedokončené transakce. Pro jejich dokončení raději nejprve spusťte " -+"yum-complete-transaction." ++msgstr "Existují nedokončené transakce. Pro jejich dokončení raději nejprve spusťte yum-complete-transaction." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -15765,10 +15955,10 @@ index 622394b..19b1b6f 100644 msgid "" "\n" "Packages skipped because of dependency problems:" - msgstr "" - "\n" +-msgstr "" +-"\n" -"Balíček přeskočen kvůli problémům se závislostmi:" -+"Balíčky přeskočené kvůli problémům se závislostmi:" ++msgstr "\nBalíčky přeskočené kvůli problémům se závislostmi:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -15781,10 +15971,10 @@ index 622394b..19b1b6f 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" +-msgstr "" -"** Nalezeny %d pre-existující problémy rpmdb, následuje výstup \"yum " -"check\":" -+"** Nalezeny %d existující problémy v rpmdb, následuje výstup \"yum check\":" ++msgstr "** Nalezeny %d existující problémy v rpmdb, následuje výstup \"yum check\":" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -15807,9 +15997,10 @@ index 622394b..19b1b6f 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Varování: Během transakce došlo k chybě skriptletu nebo jiné nefatální " - "chybě." +-msgstr "" +-"Varování: Během transakce došlo k chybě skriptletu nebo jiné nefatální " +-"chybě." ++msgstr "Varování: Během transakce došlo k chybě skriptletu nebo jiné nefatální chybě." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -15831,7 +16022,7 @@ index 622394b..19b1b6f 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" -msgstr "%s mělo být nainstalováno, ale není!" @@ -15843,25 +16034,22 @@ index 622394b..19b1b6f 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" -msgstr "%s mělo být odstraněno, ale není!" -+msgstr "%s by mělo být odstraněno, ale není!" - +- -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Nelze otevřít zámek %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Nelze otevřít zámek %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" +-#, python-format +-msgid "Unable to check if PID %s is active" -msgstr "Nedá se zkontrolovat, zda je PID %s aktivní." -+msgstr "Nelze zkontrolovat, zda je PID %s aktivní." ++msgstr "%s by mělo být odstraněno, ale není!" #. Another copy seems to be running. -#: ../yum/__init__.py:1789 @@ -15872,44 +16060,59 @@ index 622394b..19b1b6f 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nelze vytvořit zámek na %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Nelze otevřít zámek %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Nelze zkontrolovat, zda je PID %s aktivní." ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2482,103 +2621,95 @@ msgstr "" - "Balíček neodpovídá zamýšlenému stahování. Zkuste spustit: yum " "--enablerepo=%s clean metadata" +-msgstr "" +-"Balíček neodpovídá zamýšlenému stahování. Zkuste spustit: yum " +-"--enablerepo=%s clean metadata" ++msgstr "Balíček neodpovídá zamýšlenému stahování. Zkuste spustit: yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Nelze zkontrolovat kontrolní součet" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" -msgstr "Balíček neodpovídá kontrolnímu součtu" +msgstr "Kontrolní součet balíčku nesouhlasí" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" -msgstr "balíček neprošel kontrolním součtem ale skladiště je povoleno pro %s" +msgstr "kontrolní součet balíčku nesouhlasím, avšak pro %s je povolena cache" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" -msgstr "používá se lokální kopie %s" -- ++msgstr "použití lokální kopie %s" + -#: ../yum/__init__.py:1991 -#, python-format -msgid "" @@ -15920,76 +16123,74 @@ index 622394b..19b1b6f 100644 -"Nedostatek diskového prostoru ve stahovacím adresáři %s\n" -" * volno %s\n" -" * potřeba %s" -+msgstr "použití lokální kopie %s" - +- -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Hlavička není kompletní." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" - msgstr "" +-msgstr "" -"Hlavička není v lokálním skladišti, ale je povoleno používat pouze " -"skladiště. Nemohu stáhnout %s" -+"Hlavička není v lokální cache, avšak nic jiného nelze použít. Nelze stáhnout" -+" %s" ++msgstr "Hlavička není v lokální cache, avšak nic jiného nelze použít. Nelze stáhnout %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Veřejný klíč %s není nainstalován" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problém s otevřením balíčku %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Veřejný klíč %s není důvěryhodný" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Balíček %s není podepsán" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" -msgstr "Nemohu odstranit %s" +msgstr "Nelze odstranit %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s odstraněn" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" -msgstr "Nemohu odstranit %s soubor %s" +msgstr "Nelze odstranit %s soubor %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s soubor %s odstraněn" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s soubor odstraněn" @@ -16000,30 +16201,31 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" -msgstr "Více než jedna identická shoda v pytli pro %s" +msgstr "Více než jedna identická shoda v souhrnu pro %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" -msgstr "Nic se neshoduje s %s.%s %s:%s-%s z aktualizace" +msgstr "Z aktualizace se nic neshoduje s %s.%s %s:%s-%s" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2586,382 +2717,405 @@ msgstr "" - "searchPackages() bude odstraněn v příští verzi Yumu. " - "Používejte místo něj searchGenerator(). \n" +-msgstr "" +-"searchPackages() bude odstraněn v příští verzi Yumu. " +-"Používejte místo něj searchGenerator(). \n" ++msgstr "searchPackages() bude odstraněn v příští verzi Yumu. Používejte místo něj searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Prohledává se %d balíčků" @@ -16034,26 +16236,26 @@ index 622394b..19b1b6f 100644 +msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" -msgstr "prohledává se balíček %s" +msgstr "vyhledávání balíčku %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" -msgstr "hledá se v souborových položkách" +msgstr "vyhledávání v názvech souborů" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" -msgstr "hledá se v položkách poskytovatelů" +msgstr "vyhledávání v položkách poskytuje" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" -msgstr "Pro nastavený repozitář nejsou žádná dostupná skupinová data" +msgstr "Pro aktivní repozitáře nejsou k dispozici žádná data o skupinách" @@ -16061,43 +16263,43 @@ index 622394b..19b1b6f 100644 -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" -msgstr "Neexistuje skupina pojmenovaná %s" +msgstr "Neexistuje skupina %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "balíček %s nebyl označen ve skupině %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" -msgstr "Přidává se balíček %s pro skupinu %s" +msgstr "Přidání balíčku %s ze skupiny %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" -msgstr "Žádný balíček pojmenovaný %s není dostupný pro instalaci" +msgstr "Pro instalaci není k dispozici žádný balíček s názvem %s" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Varování: Skupina %s neobsahuje žádné balíčky." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -16106,47 +16308,47 @@ index 622394b..19b1b6f 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" -msgstr "Uspořádaný seznam balíčků %s nenalezen v pytli balíčků" +msgstr "Položka balíčku %s nenalezena v souhrnu balíčků" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" -msgstr "Uspořádaný seznam balíčků %s nenalezen v rpmdb" +msgstr "Položka balíčku %s nenalezena v rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "Neplatný příznak verze z: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" -msgstr "Nebyl nalezen balíček pro %s" +msgstr "Pro %s nebyl nalezen žádný balíček" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Objekt balíčku nebyl instancí balíčkového objektu" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" -msgstr "Nebylo určeno nic k instalaci" +msgstr "K instalaci nebylo nic určeno" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" -msgstr "Hledá se virtuální poskytovatel nebo soubor poskytující %s" @@ -16154,67 +16356,64 @@ index 622394b..19b1b6f 100644 -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" -msgstr "Nenalezena shoda pro argument: %s" +msgstr "Pro argument nenalezena shoda: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Balíček %s je nainstalován, ale není dostupný" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" -msgstr "Žádné balíčky dostupné pro instalaci" +msgstr "K instalaci nejsou dostupné žádné balíčky" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Balíček: %s - již je v transakční sadě" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" -msgstr "Balíček %s je zastaralý balíčkem %s, který je již nainstalován" -+msgstr "" -+"Balíček %s je označen za zastaralý balíčkem %s, který je již nainstalován" ++msgstr "Balíček %s je označen za zastaralý balíčkem %s, který je již nainstalován" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " "requirements" - msgstr "" +-msgstr "" -"Balíček %s je zastaralý balíčkem %s, ale nový balíček nesplňuje závislosti" -+"Balíček %s je označen za zastaralý balíčkem %s, ale není poskytnut pro " -+"vyřešení závislostí" ++msgstr "Balíček %s je označen za zastaralý balíčkem %s, ale není poskytnut pro vyřešení závislostí" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" +-msgstr "" -"Balíček %s je zastaralý balíčkem %s, zkouší se místo něj instalovat %s" -+"Balíček %s je označen za zastaralý balíčkem %s, zkouší se místo něj " -+"instalovat %s" ++msgstr "Balíček %s je označen za zastaralý balíčkem %s, zkouší se místo něj instalovat %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Balíček %s je již nainstalován a v poslední verzi" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." -msgstr "Balíček odpovídající %s je již nainstalován. Hledají se aktualizace." @@ -16222,44 +16421,44 @@ index 622394b..19b1b6f 100644 #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" -msgstr "Aktualizuje se vše" +msgstr "Aktualizace všeho" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Neaktualizuje se balíček, který je již zastaralý: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Balíček je již zastaralý: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Neaktualizuje se balíček, který je zastaralý: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Neaktualizuje se balíček, který jej již aktuální: %s.%s %s:%s-%s" @@ -16267,47 +16466,47 @@ index 622394b..19b1b6f 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nenalezen žádný shodný balíček pro odstranění" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" -msgstr "Přeskakuji aktuálně používané jádro: %s" +msgstr "Aktuálně používané jádro bylo přeskočeno: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" -msgstr "Odstraňuji %s z transakce" +msgstr "Odstranění %s z transakce" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nelze otevřít: %s. Přeskakuje se." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" -msgstr "Zkoumá se %s: %s" +msgstr "Zkoumání %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." -msgstr "Nelze lokálně instalovat deltarpm: %s. Přeskakuje se." +msgstr "Nelze lokálně nainstalovat deltarpm: %s. Přeskakuje se." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" @@ -16315,158 +16514,155 @@ index 622394b..19b1b6f 100644 +msgstr "Do transakce nelze přidat balíček %s. Nekompatibilní architektura: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" -msgstr "Nelze instalovat balíček %s. Je zastaralý nainstalovaným balíčkem %s" -+msgstr "" -+"Nelze nainstalovat balíček %s. Je zastaralý nainstalovaným balíčkem %s" ++msgstr "Nelze nainstalovat balíček %s. Je zastaralý nainstalovaným balíčkem %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " "instead." - msgstr "" +-msgstr "" -"Balíček %s není nainstalován, nelze jej aktualizovat. Spusťte místo toho yum" -" install a nainstalujte jej." -+"Balíček %s není nainstalován, nelze jej aktualizovat. Nainstalujte jen " -+"příkazem yum install." ++msgstr "Balíček %s není nainstalován, nelze jej aktualizovat. Nainstalujte jen příkazem yum install." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." - msgstr "" -+"Balíček %s.%s není nainstalován, nelze jej aktualizovat. Nainstalujte jen " -+"příkazem yum install." +-msgstr "" ++msgstr "Balíček %s.%s není nainstalován, nelze jej aktualizovat. Nainstalujte jen příkazem yum install." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" -msgstr "Vynechává se %s" +msgstr "Vynechání %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" -msgstr "Označuje se %s k instalaci" +msgstr "Označení %s k instalaci" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" -msgstr "Označuje se %s jako aktualizace %s" +msgstr "Označení %s jako aktualizace %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." -msgstr "%s: není aktualizací instalovaného balíčku." +msgstr "%s: není aktualizací nainstalovaného balíčku." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nelze otevřít soubor: %s. Přeskakuje se." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Problém při reinstalaci: žádný shodný balíček k odstranění" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problém při reinstalaci: žádný shodný balíček %s k instalaci" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" -msgstr "Žádné balíčky dostupné ke snížení verze" +msgstr "Pro snížení verze není dostupný žádný balíček" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Balíček %s má dovoleno vícero instalací, přeskakuje se" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Neexistuje shoda pro dostupný balíček: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" -msgstr "Pouze aktualizace dostupná pro balíček: %s" +msgstr "Pouze aktualizace je dostupná pro balíček: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Nepodařilo se snížit verzi: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 #, python-format -msgid "Retrieving key from %s" +msgid "Failed to upgrade: %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 +#, python-format +msgid "Retrieving key from %s" +msgstr "Získávání klíče z %s" + -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Získání GPG klíče selhalo: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" -msgstr "" +msgstr "GPG podpis klíčem %s neodpovídá klíči CA pro repozitář: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "GPG podpis byl ověřen oproti CA klíči (klíčům)." -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Neplatný GPG klíč pro %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" -msgstr "Zpracování GPG klíče selhalo: klíč nemá žádnou hodnotu %s" +msgstr "Parsování GPG klíče selhalo: klíč nemá žádnou hodnotu %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -16480,7 +16676,7 @@ index 622394b..19b1b6f 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -16492,198 +16688,199 @@ index 622394b..19b1b6f 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG klíč %s (0x%s) je již nainstalován" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Import klíče selhal (kód %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Import klíče proběhl úspěšně" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" -msgstr "" +msgstr "Nebyly instalovány žádné klíče" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, 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 "" +-msgstr "" -"GPG klíč určený pro repozitář „%s“ je již nainstalován, ale není správný pro tento balíček.\n" -"Zkontrolujte, že URL klíče jsou pro repozitář správně nastavena." -+"GPG klíče určené pro repozitář „%s“ jsou již nainstalovány, avšak pro tento balíček nejsou správné.\n" -+"Zkontrolujte, zda URL klíčů jsou pro tento repozitář správně nastaveny." ++msgstr "GPG klíče určené pro repozitář „%s“ jsou již nainstalovány, avšak pro tento balíček nejsou správné.\nZkontrolujte, zda URL klíčů jsou pro tento repozitář správně nastaveny." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import klíče/ů nepomohl, špatný klíč(e)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG klíč %s (0x%s) je již naimportován" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Import klíče selhal" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Nebyly nainstalovány žádné klíče pro repozitář %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2970,164 +3124,199 @@ msgstr "" - "GPG klíče pro repozitář \"%s\" jsou již nainstalovány, ale nejsou správné.\n" - "Zkontrolujte že pro repozitář je správně nastaveno URL klíče." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG klíče pro repozitář \"%s\" jsou již nainstalovány, ale nejsou správné.\n" +-"Zkontrolujte že pro repozitář je správně nastaveno URL klíče." ++msgstr "GPG klíče pro repozitář \"%s\" jsou již nainstalovány, ale nejsou správné.\nZkontrolujte že pro repozitář je správně nastaveno URL klíče." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." -msgstr "Nemohu nalézt vhodné zrcadlo" +msgstr "Nelze nalézt vhodné zrcadlo" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Při stahování balíčků došlo k chybě." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" -msgstr "Oznamte prosím tuto chybu na %s" +msgstr "Oznamte tuto chybu na %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Chyby testu transakce: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" -msgstr "Nelze vytvořit skladiště: %s " +msgstr "Nelze nastavit adresář pro cache: %s " -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." -msgstr "" +msgstr "Závislosti nebyly vyřešeny. Nevyřešená transakce nebude uložena." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "Nelze uložit transakční soubor %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Nelze načíst uloženou transakci %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "rpmdb obsahuje jinou verzi než je v uložené transakci, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." -msgstr "" +msgstr " ignorováno, jak bylo žádáno." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." -msgstr "" +msgstr " přerušeno." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "nelze nalézt tsflags nebo tsflags není celé číslo." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "Nalezen txmbr v neznámém stavu: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "Nelze nalézt txmbr: %s ve stavu %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Nelze nalézt txmbr: %s z: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," -msgstr "" +msgstr "Transakční položky nebo vztahy chybí nebo byla transakce změněna," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" +msgstr " ignorováno. Musíte spustit redepsolve!" + +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." msgstr "" @@ -16796,20 +16993,22 @@ index 622394b..19b1b6f 100644 -msgstr "Přebaluje se" +msgstr "Přebalení" + ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Nedostatek místa v cílovém adresáři pro stahování: %s\n" -+" * volné místo %s\n" -+" * je potřeba %s" ++msgstr "Nedostatek místa v cílovém adresáři pro stahování: %s\n * volné místo %s\n * je potřeba %s" #: ../rpmUtils/oldUtils.py:33 #, python-format -@@ -3141,11 +3330,11 @@ msgstr "Pro RPM %s selhala kontrola md5" +@@ -3141,11 +3242,11 @@ msgstr "Pro RPM %s selhala kontrola md5" #: ../rpmUtils/oldUtils.py:151 msgid "Could not open RPM database for reading. Perhaps it is already in use?" @@ -16823,11 +17022,17 @@ index 622394b..19b1b6f 100644 #: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260 #: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266 +@@ -3157,5 +3258,3 @@ msgstr "Poškozená hlavička %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Chyba při otevření rpm %s - chyba %s" +- +- diff --git a/po/da.po b/po/da.po -index a7202e2..dadbd91 100644 +index a7202e2..b6561e6 100644 --- a/po/da.po +++ b/po/da.po -@@ -2,14 +2,15 @@ +@@ -2,941 +2,958 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -16837,22 +17042,24 @@ index a7202e2..dadbd91 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" -+"Last-Translator: james \n" - "Language-Team: Danish (http://www.transifex.net/projects/p/yum/team/da/)\n" +-"Language-Team: Danish (http://www.transifex.net/projects/p/yum/team/da/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-27 22:53+0000\n" ++"Last-Translator: Kris Thomsen \n" ++"Language-Team: Danish (http://www.transifex.net/projects/p/yum/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Opdaterer" @@ -16863,38 +17070,39 @@ index a7202e2..dadbd91 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installerer" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Overflødiggjort" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Opdateret" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Slettet" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Installeret" -#: ../callback.py:130 +#: ../callback.py:142 msgid "No header - huh?" - msgstr "Ingen header - meget mystisk" +-msgstr "Ingen header - meget mystisk" ++msgstr "Ingen header - mystisk" -#: ../callback.py:168 +#: ../callback.py:180 @@ -16914,7 +17122,7 @@ index a7202e2..dadbd91 100644 msgstr "Slettet: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Fjerner" @@ -16924,175 +17132,179 @@ index a7202e2..dadbd91 100644 msgstr "Oprydning af" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Kommandoen \"%s\" er allerede defineret" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Indstiller pakkearkiver" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Læser pakkearkiv for metadata fra lokale filer" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurationsfejl: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Fejl i indstilling: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installeret: %s-%s på %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Bygget : %s på %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Indsendt: %s på %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Du skal angive en kommando" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Ingen sådan kommando: %s. Brug %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Behov for diskplads:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Mindst %dMB mere plads er krævet på filsystemet %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" +msgstr[0] " Mindst %dMB mere plads er krævet på filsystemet %s.\n" -+msgstr[1] " Mindst %dMB mere plads er krævet på filsystemet %s.\n" ++msgstr[1] " Mindst %dMB mere plads er krlvet på filsystemet %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,60 +143,60 @@ msgstr "" - "Fejlopsummering\n" - "---------------\n" +-msgstr "" +-"Fejlopsummering\n" +-"---------------\n" ++msgstr "Fejlopsummering\n---------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Forsøger at udføre overførslen, men der intet at udføre. Afslutter." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Afslutter efter brugerens ønske" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Henter pakker:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Fejl ved hentning af pakker:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" - msgstr "" +-msgstr "" ++msgstr "Kører overførselskontrol" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "FEJL Du skal opdatere RPM for at håndtere:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" - msgstr "" +-msgstr "" ++msgstr "FEJL med overførselskontrol vs depsolve" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM skal opdateres" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Rapportér venligst denne fejl i %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Kører overførselstest" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Fejl i overførselskontrol:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Overførselstest afsluttet uden fejl" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Kører overførsel" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -201,236 +204,259 @@ msgstr "" - "Afviser automatisk importering af nøgler ved baggrundskørsel.\n" - "Brug \"-y\" til at overskrive." +-msgstr "" +-"Afviser automatisk importering af nøgler ved baggrundskørsel.\n" +-"Brug \"-y\" til at overskrive." ++msgstr "Afviser automatisk importering af nøgler ved baggrundskørsel.\nBrug \"-y\" til at overskrive." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Du mente måske: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pakke(r) %s%s%s tilgængelig(e), men ikke installeret." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Pakken %s%s%s er ikke tilgængelig." @@ -17100,83 +17312,83 @@ index a7202e2..dadbd91 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pakke(r) til installation" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke at installere" ++msgstr[1] "%d pakker at installere" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Intet at udføre" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakker markeret til opdatering" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke markeret til opdatering" ++msgstr[1] "%d pakker markeret til opdatering" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Ingen pakker markeret til opdatering" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakker er markeret til distributionssynkronisering" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke markeret til distributionssynkronisering" ++msgstr[1] "%d pakker markeret til distributionssynkronisering" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Ingen pakker er markeret til distributionssynkronisering" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakker markeret til fjernelse" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke markeret til fjernelse" ++msgstr[1] "%d pakker markeret til fjernelse" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Ingen pakker markeret til fjernelse" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pakke(r) til nedgradering" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke at nedgradere" ++msgstr[1] "%d pakker at nedgradere" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (fra %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installeret pakke %s%s%s%s er ikke tilgængelig." @@ -17184,784 +17396,807 @@ index a7202e2..dadbd91 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pakke(r) til geninstallation" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke at geninstallere" ++msgstr[1] "%d pakker at geninstallere" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Ingen pakker angivet" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Pakke(r) til installation" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" - msgstr "" +-msgstr "" ++msgstr "N/s matchede: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" +-msgstr "" ++msgstr " Navn og resumé matchede, brug %skun%s \"search all\" til alting." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" +-msgstr "" ++msgstr " Fulde navn og resumé matchede %skun%s, brug \"search all\" for alting." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Matchede: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" +-msgstr "" ++msgstr " Navn og resumé matchede %snæsten%s, brug \"search all\" for alting." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Advarsel: Ingen match blev fundet for: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Ingen match fundet" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Ingen pakke fundet for %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Oprydder pakkearkiver: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Oprydning af alt" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Oprydning af headerfiler" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Oprydning af pakker" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Oprydning af xml-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Oprydning af mellemlager til database" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Oprydning af udløbet mellemlager til metadata" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Rydder mellemlagret rpmdb-data op" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Oprydning af udvidelsesmoduler" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" - msgstr "" +-msgstr "" ++msgstr "Advarsel: Ingen grupper matcher: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Installerede grupper:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" - msgstr "" +-msgstr "" ++msgstr "Installerede sproggruppper:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Tilgængelige grupper:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" - msgstr "" +-msgstr "" ++msgstr "Tilgængelige sproggrupper:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Afsluttet" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Advarsel: Gruppen %s findes ikke." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Ingen pakke i nogen de efterspurgte grupper, er tilgængelige til " - "installation eller opdatering" +-msgstr "" +-"Ingen pakke i nogen de efterspurgte grupper, er tilgængelige til " +-"installation eller opdatering" ++msgstr "Ingen pakke i nogen de efterspurgte grupper, er tilgængelige til installation eller opdatering" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakke(r) til installation" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke at installere" ++msgstr[1] "%d pakker at installere" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Gruppen %s findes ikke" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Ingen pakker at fjerne fra grupper" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakke(r) til fjernelse" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d pakke at fjerne" ++msgstr[1] "%d pakker at fjerne" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakken %s er allerede installeret, springer over" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, 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:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Ingen andre %s er installeret, tilføjer til liste til mulig installation" +-msgstr "" +-"Ingen andre %s er installeret, tilføjer til liste til mulig installation" ++msgstr "Ingen andre %s er installeret, tilføjer til liste til mulig installation" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Indstillinger til udvidelsesmodul" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Kommandoliniefejl: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -441,285 +467,289 @@ msgstr "" "\n" - "%s: %s indstilling kræver et argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s indstilling kræver et argument" ++msgstr "\n\n%s: %s indstilling kræver et argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color tager en af: auto, altid, aldrig" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" - msgstr "" +-msgstr "" ++msgstr "--installroot skal være en komplet sti: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "vis denne hjælpemeddelse og afslut" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "vær fejltolerant" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "kør udelukkende fra systemmellemlager, opdatér ikke mellemlager" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "placering af konfigurationsfil" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maksimal ventetid på kommando" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "debug-visningsniveau" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "vis gengangere, i pakkearkiver, i list/search-kommandoer" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "fejlvisningsniveau" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "outputniveau for fejlsøgning af rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "stille operation" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "uddybende operation" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "svar ja til alle spørgsmål" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" -+msgstr "" ++msgstr "svar nej til alle spørgsmål" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "vis Yum-version og afslut" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "sæt installationsroden" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "aktivér en eller flere pakkearkiver (wildcards er tilladt)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "deaktivér en eller flere pakkearkiver (wildcards er tilladt)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "ekskludér pakke(r) med navn eller klump" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "deaktivér ekskludering fra main, for et pakkearkiv eller for alt" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "aktivér overflødiggørelse under behandling af opdateringer" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "deaktivér Yum-udvidelsesmoduler" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "deaktivér kontrol af gpg-signaturer" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "deaktivér udvidelsesmoduler ved navn" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "aktivér udvidelsesmoduler ved navn" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "spring pakker med afhængighedsproblemer over" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontrollér om farve er brugt" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "indstil værdi for $releaseever i yum-konfiguration og pakkearkivsfiler" +-msgstr "" +-"indstil værdi for $releaseever i yum-konfiguration og pakkearkivsfiler" ++msgstr "indstil værdi for $releaseever i yum-konfiguration og pakkearkivsfiler" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "indstil arbitrærkonfiguration og indstillinger for pakkearkiv" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Maj" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Aug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Okt" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Dec" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Prøver et andet filspejl." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Navn : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arkitektur : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoch : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Version : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Udgivelse : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Størrelse : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Kilde : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Fra pakkearkiv : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Tilføjer : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Tilføjelsestidspunkt : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Bygningstidspunkt : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Installationstid: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Installeret af: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Ændret af : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Beskrivelse : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licens : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Beskrivelse : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "j" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ja" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "nej" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Er dette o.k? [j/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -728,154 +758,156 @@ msgstr "" - "\n" - "Gruppe: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Gruppe: %s" ++msgstr "\nGruppe: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Gruppeid: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Beskrivelse: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" - msgstr "" +-msgstr "" ++msgstr " Sprog: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Tvungne pakker:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Standardpakker:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Valgfrie pakker:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Afhængige pakker:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "pakke: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Ingen afhængigheder for denne pakke" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " afhængighed: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Ufuldendt afhængighed" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Matchet af:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licens : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Filnavn : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Andre : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Der opstod en fejl i beregning af den totale nedhentningsstørrelse" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Total størrelse: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Total nedhentningsstørrelse: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Installationsstørrelse: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Der opstod en fejl ved udregning af installeret størrelse" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Geninstallerer" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Nedgraderer" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Installerer til afhængigheder" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Opdaterer til afhængigheder" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Fjerner for afhængigheder" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Sprunget over (afhængighedsproblemer)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Ikke installeret" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" - msgstr "" +-msgstr "" ++msgstr "Ikke tilgængelig" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Pakke" +msgid_plural "Packages" +msgstr[0] "Pakke" -+msgstr[1] "" ++msgstr[1] "Pakker" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arkitektur" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Version" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Pakkearkiv" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Størrelse" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " erstatter %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -886,57 +918,58 @@ msgstr "" - "Overførselsopsummering\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Overførselsopsummering\n" +-"%s\n" ++msgstr "\nOverførselsopsummering\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installér %5.5s pakke(r)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Installér" @@ -17969,23 +18204,23 @@ index a7202e2..dadbd91 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Opgradér %5.5s pakke(r)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" -+msgstr "" ++msgstr "Opgradér" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Fjern %5.5s pakke(r)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" -+msgstr "" ++msgstr "Fjern" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Geninstallér %5.5s pakke(r)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Geninstallér" @@ -17993,322 +18228,337 @@ index a7202e2..dadbd91 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Nedgradér %5.5s pakke(r)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Nedgradér" -+ -+#: ../output.py:1464 -+msgid "Dependent package" -+msgid_plural "Dependent packages" -+msgstr[0] "" -+msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1471 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "Afhængighedspakke" ++msgstr[1] "Afhængighedspakker" ++ ++#: ../output.py:1531 msgid "Removed" msgstr "Fjernet" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Afhængighed fjernet" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Afhængighed installeret" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Afhængighed opdateret" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Erstattet" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Fejlede" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "to" -@@ -944,7 +977,7 @@ msgstr "to" +@@ -944,577 +961,610 @@ msgstr "to" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -955,364 +988,416 @@ msgstr "" - " Nuværende hentning afbrudt, %safbryd (ctrl-c) igen%s indenfor %s%s%s sekunder\n" - "for at afslutte.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Nuværende hentning afbrudt, %safbryd (ctrl-c) igen%s indenfor %s%s%s sekunder\n" +-"for at afslutte.\n" ++msgstr "\n Nuværende hentning afbrudt, %safbryd (ctrl-c) igen%s indenfor %s%s%s sekunder\nfor at afslutte.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "afsluttet af bruger" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Ialt" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" - msgstr "" +-msgstr "" ++msgstr "Overspringer sammenflettet overførsel %d til %d, eftersom den overlapper" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" - msgstr "" +-msgstr "" ++msgstr "Ingen overførsler" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Dårlige overførsels-id'er eller pakker givet" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" - msgstr "" +-msgstr "" ++msgstr "Kommandolinje" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Log bruger ind" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Dato og tid" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Handling(er)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Ændret" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Intet overførsels-id givet" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Dårlig overførsels-id givet" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Det angivne overførsels-id ikke fundet" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Fandt mere end ét overførsels-id!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Intet overførsels-id eller pakke givet" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Nedgraderet" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Ældre" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Nyere" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" - msgstr "Overførsels-id:" +-msgstr "Overførsels-id:" ++msgstr "Overførsels-id :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" - msgstr "Starttidspunkt :" +-msgstr "Starttidspunkt :" ++msgstr "Starttidspunkt :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Start rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" - msgstr "" +-msgstr "" ++msgstr "(%u sekunder)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" - msgstr "" +-msgstr "" ++msgstr "(%u minutter)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" - msgstr "" +-msgstr "" ++msgstr "(%u timer)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" - msgstr "" +-msgstr "" ++msgstr "(%u dage)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Sluttidspunkt :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Slut rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Bruger :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Returkode :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Afbrudt" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" - msgstr "" +-msgstr "" ++msgstr "Fejl:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Fejl:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Succes" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Kommandolinje :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Yderligere ikke-standard information gemt: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" - msgstr "Overførsel udført med" +-msgstr "Overførsel udført med" ++msgstr "Overførsel udført med:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Pakker ændret:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Pakker sprunget over:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problemer med rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scriptletoutput:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Fejl:" @@ -18317,17 +18567,17 @@ index a7202e2..dadbd91 100644 -msgstr "Installér" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Installér afhængigheder" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Forælder" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Slet" @@ -18340,296 +18590,314 @@ index a7202e2..dadbd91 100644 -msgstr "Nedgradér" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Opdatér" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Tid" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Sidste dag" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Sidste uge" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Seneste to uger" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Seneste tre måneder" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Seneste seks måneder" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Sidste år" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Over et år siden" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Ingen overførsel %s fundet" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Overførsels-id:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Yderligere historikinformation tilgængelig:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Intet yderligere data fundet med dette navn" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" -+msgstr "" ++msgstr "Pakke :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" -+msgstr "" ++msgstr "Status :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" -+msgstr "" ++msgstr "Størrelse :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" -+msgstr "" ++msgstr "Bygningsvært :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" -+msgstr "" ++msgstr "Bygningstid :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" -+msgstr "" ++msgstr "Pakker :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" -+msgstr "" ++msgstr "Fabrikant :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" -+msgstr "" ++msgstr "Licens :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" -+msgstr "" ++msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" -+msgstr "" ++msgstr "Kilderpm :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" -+msgstr "" ++msgstr "Tilføjelsestid :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" -+msgstr "" ++msgstr "Tilføjer :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" -+msgstr "" ++msgstr "Grund :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" -+msgstr "" ++msgstr "Fra pakkearkiv :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" -+msgstr "" ++msgstr "Installeret af :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" -+msgstr "" ++msgstr "Ændret af :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installeret" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" - msgstr "" +-msgstr "" ++msgstr "en opdatering" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "slettet" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "geninstalleret" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" - msgstr "" +-msgstr "" ++msgstr "en nedgradering" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" - msgstr "" +-msgstr "" ++msgstr "overflødigører" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "opdateret" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "overflødiggjort" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" - msgstr "" +-msgstr "" ++msgstr "---> Pakke %s.%s %s:%s-%s vil blive %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Kører overførselskontrol" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Genstarter afhængighedssøgning med nye ændringer." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Afsluttede afhængighedssøgningen" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Behandler afhængighed: %s for pakken: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Beholder pakke: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ikke fundet afhængighed: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Pakke: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1321,7 +1406,7 @@ msgstr "" - "\n" - " Kræver: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Kræver: %s" ++msgstr "\n Kræver: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1330,7 +1415,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1339,7 +1424,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1348,85 +1433,85 @@ msgstr "" - " Ikke fundet" +-msgstr "" +-"\n" +-" Ikke fundet" ++msgstr "\n Ikke fundet" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Opdateret af" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Nedgraderet af" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Forældet af" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Tilgængelig" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Behandler konflikt: %s konflikter med %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Udfylder overførselssættet med valgte pakker. Vent venligst." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Henter headerfil for %s til at indsætte i overførselssættet." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Verificerer" ++ +#: ../utils.py:129 msgid "Running" msgstr "Kører" @@ -18655,7 +18923,7 @@ index a7202e2..dadbd91 100644 msgstr "Fundet/stoppet" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Ukendt" @@ -18693,36 +18961,47 @@ index a7202e2..dadbd91 100644 msgid "" "\n" "\n" -@@ -1436,7 +1521,7 @@ msgstr "" - "\n" - "Afslutter efter brugerens ønske" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Afslutter efter brugerens ønske" ++msgstr "\n\nAfslutter efter brugerens ønske" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1446,7 +1531,7 @@ msgstr "" - "\n" - "Afslutter på ødelagt tunnel" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Afslutter på ødelagt tunnel" ++msgstr "\n\nAfslutter på ødelagt tunnel" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1457,7 +1542,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1465,36 +1550,36 @@ msgstr "" - "Et andet program holder i øjeblikket yum-låsen; afslutter som konfigureret " - "af exit_on_llock" +-msgstr "" +-"Et andet program holder i øjeblikket yum-låsen; afslutter som konfigureret " +-"af exit_on_llock" ++msgstr "Et andet program holder i øjeblikket yum-låsen; afslutter som konfigureret af exit_on_llock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -18745,8 +19024,9 @@ index a7202e2..dadbd91 100644 -#: ../utils.py:346 ../yummain.py:194 +#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" - msgstr "" - " Du kunne prøve at bruge --skip-broken til at arbejde udenom problemet" +-msgstr "" +-" Du kunne prøve at bruge --skip-broken til at arbejde udenom problemet" ++msgstr " Du kunne prøve at bruge --skip-broken til at arbejde udenom problemet" -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 @@ -18764,16 +19044,22 @@ index a7202e2..dadbd91 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1502,7 +1587,7 @@ msgstr "" - "\n" - "Afhængigheder løst" +-msgstr "" +-"\n" +-"Afhængigheder løst" ++msgstr "\nAfhængigheder løst" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Afsluttet!" -@@ -1514,7 +1599,7 @@ msgstr "" + #: ../yumcommands.py:42 + msgid " Mini usage:\n" +-msgstr "" ++msgstr " Minibrug:\n" + + #: ../yumcommands.py:52 msgid "You need to be root to perform this command." msgstr "Du skal være root for at udføre denne kommando." @@ -18782,15 +19068,32 @@ index a7202e2..dadbd91 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1544,53 +1629,53 @@ msgstr "" +@@ -1529,583 +1579,592 @@ msgid "" + "will install it for you.\n" "\n" - "For mere information, kan du kontakte din distribution eller pakkeudbyder.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Du har aktiveret kontrol af pakker via GPG-nøgler. Dette er en god ting. \n" +-"Selvom du ikke har nogen GPG-nøgler installeret. Du bliver nødt til at hente\n" +-"nøglerne til pakkerne, som du vil installere og installere dem.\n" +-"Du kan gøre det ved at køre kommandoen:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Alternativt kan du angive URL'en til nøglen, som du vil bruge til et\n" +-"pakkearkiv i \"gpgkey\"-indstillingen i en pakkearkivssektion og Yum \n" +-"vil installere den for dig.\n" +-"\n" +-"For mere information, kan du kontakte din distribution eller pakkeudbyder.\n" ++msgstr "\nDu har aktiveret kontrol af pakker via GPG-nøgler. Dette er en god ting. \nSelvom du ikke har nogen GPG-nøgler installeret. Du bliver nødt til at hente\nnøglerne til pakkerne, som du vil installere og installere dem.\nDu kan gøre det ved at køre kommandoen:\n rpm --import public.gpg.key\n\n\nAlternativt kan du angive URL'en til nøglen, som du vil bruge til et\npakkearkiv i \"gpgkey\"-indstillingen i en pakkearkivssektion og Yum \nvil installere den for dig.\n\nFor mere information, kan du kontakte din distribution eller pakkeudbyder.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 #, python-format msgid "Problem repository: %s" - msgstr "" +-msgstr "" ++msgstr "Problempakkearkiv: %s" -#: ../yumcommands.py:80 +#: ../yumcommands.py:94 @@ -18847,9 +19150,12 @@ index a7202e2..dadbd91 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1600,307 +1685,296 @@ msgstr "" - " Kør \"yum repolist all\" for at se de pakkearkiver du har.\n" - " Du kan aktivere pakkearkiver med yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Der er ingen aktiverede pakkearkiver.\n" +-" Kør \"yum repolist all\" for at se de pakkearkiver du har.\n" +-" Du kan aktivere pakkearkiver med yum-config-manager --enable " ++msgstr "Der er ingen aktiverede pakkearkiver.\n Kør \"yum repolist all\" for at se de pakkearkiver du har.\n Du kan aktivere pakkearkiver med yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -18950,7 +19256,7 @@ index a7202e2..dadbd91 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "" ++msgstr "Vis, eller brug, gruppernes information" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -18979,7 +19285,7 @@ index a7202e2..dadbd91 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "" ++msgstr "Ugyldig underkommando for grupper, brug: %s." -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -18994,8 +19300,9 @@ index a7202e2..dadbd91 100644 -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "Dette kan tage et stykke tid, afhængigt af hastigheden op denne computer" +-msgstr "" +-"Dette kan tage et stykke tid, afhængigt af hastigheden op denne computer" ++msgstr "Dette kan tage et stykke tid, afhængigt af hastigheden op denne computer" -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -19082,333 +19389,349 @@ index a7202e2..dadbd91 100644 msgstr "Viser de konfigurerede pakkearkiver" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "aktiveret" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "deaktiveret" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Pakkearkivs-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Pakkearkivnavn : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Pakkearkivstatus : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Pakkearkivsversion: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Pakkearkivflag : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Kildedistroflag: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Pakkearkiv opdateret : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Pakkearkivpakker : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Pakkearkivstørrelse : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Pakkearkivbaseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Pakkearkivsmetahenvisning: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Opdateret : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Pakkearkivspejle: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Aldrig (senest: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Med det samme (senest: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekund(er) (senest: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Pakkearkiv udløber : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Pakkearkiv ekskluderer : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Pakkearkiv inkluderer : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Pakkearkiv ekskluderet: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " - msgstr "" +-msgstr "" ++msgstr "Pakkearkivsfilnavn: " #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "kildeid" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "kildenavn" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Viser hjælp om brugen af en kommando" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Ingen tilgængelig hjælp til %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1910,7 +1984,7 @@ msgstr "" - "\n" - "aliaser: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"aliaser: " ++msgstr "\n\naliaser: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1920,85 +1994,125 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Opsætning af geninstallationsprocessen" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "geninstallér en pakke" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Opsætning af nedgraderingsprocessen" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "nedgradér en pakke" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Vis en version for maskinen og/eller tilgængelige pakkearkiver." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum versiongrupper:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Gruppe :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Pakker:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Installeret:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" - msgstr "Gruppe-Installeret" +-msgstr "Gruppe-Installeret" ++msgstr "Gruppeinstalleret:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Tilgængelige:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Gruppe-Tilgængelig:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Vis eller brug overførselshistorik" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" -+msgstr "" ++msgstr "Overførsler:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" -+msgstr "" ++msgstr "Starttid :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" -+msgstr "" ++msgstr "Sluttid :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" -+msgstr "" ++msgstr "Tæller :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" -+msgstr "" ++msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" -+msgstr "" ++msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" -+msgstr "" ++msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" -+msgstr "" ++msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" -+msgstr "" ++msgstr " rpmdb :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" -+msgstr "" ++msgstr " yumdb :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Ugyldig underkommando for historik, brug: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Du har ikke adgang til historikdatabasen." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Kontrollér for problemer i rpmdb'en" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" - msgstr "" +-msgstr "" ++msgstr "indlæs en gemt overførsel fra filnavn" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." - msgstr "" +-msgstr "" ++msgstr "Ingen gemt overførselsfil angivet." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" - msgstr "" +-msgstr "" ++msgstr "indlæser overførsel fra %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" - msgstr "" -@@ -2009,26 +2123,32 @@ msgstr "" +-msgstr "" ++msgstr "Overførsel indlæst fra %s med %s medlemmer" + + #. This is mainly for PackageSackError from rpmdb. + #: ../yummain.py:84 + #, python-format msgid " Yum checks failed: %s" - msgstr "" +-msgstr "" ++msgstr " Yum-kontrol mislykkedes: %s" -#: ../yummain.py:114 --msgid "" --"Another app is currently holding the yum lock; waiting for it to exit..." --msgstr "Yum er låst af et andet program, venter på at den afslutter..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" - --#: ../yummain.py:120 ++msgstr "Ingen læse-/køre-adgang i nuværende mappe, flytter til /" ++ +#: ../yummain.py:124 - msgid "Can't create lock file; exiting" - msgstr "" - -+#: ../yummain.py:128 -+msgid "" -+"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "Yum er låst af et andet program, venter på at den afslutter..." ++msgid "Can't create lock file; exiting" ++msgstr "Kan ikke oprette låsfil; afslutter" + ++#: ../yummain.py:128 + msgid "" + "Another app is currently holding the yum lock; waiting for it to exit..." + msgstr "Yum er låst af et andet program, venter på at den afslutter..." + +-#: ../yummain.py:120 +-msgid "Can't create lock file; exiting" +-msgstr "" +- #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -19419,286 +19742,294 @@ index a7202e2..dadbd91 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" +-msgstr "" +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" - msgstr "" ++msgstr "Din overførsel blev gemt, kør den igen med:\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2038,74 +2158,74 @@ msgstr "" - "\n" - "Afslutter efter brugerens ønske." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Afslutter efter brugerens ønske." ++msgstr "\n\nAfslutter efter brugerens ønske." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 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:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Opsætning af TransactionSets før config-klassen er sat op" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Invalid tsflag i konfigurationsfilen: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Søger i pkgSack for afhængigheden: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Medlem: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s konverteret til installation" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Tilføjer pakke %s i mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Fjerner pakke %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s behøver: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s kræver %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Afhængighed fundet tidligere, snyder" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, 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:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Mulig udbyder: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Tilstand er %s for udbyder af %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Tilstand for pakke som leverer %s: %s" -@@ -2113,114 +2233,114 @@ msgstr "Tilstand for pakke som leverer %s: %s" +@@ -2113,1022 +2172,1029 @@ msgstr "Tilstand for pakke som leverer %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" - msgstr "" +-msgstr "" ++msgstr "Prøver at opdatere %s for at løse afhængigheder" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" - msgstr "" +-msgstr "" ++msgstr "Ingen opdateringsstier fundet for %s. Fejl!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s pakker som behøver %s markeret til sletning" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, 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:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Opdaterer %s for at opfylde afhængighed." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, 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:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Hurtigmatchede %s som afhængighed for %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s er i udbudte pakker, men er allerede installeret, fjerner." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Mulig løsningspakke %s har en nyere udgave i ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Mulig løsningspakke %s har en nyere udgave installeret." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s er allerede i ts, springer den over" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Markerer %s som en opdatering for %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Markerer %s til installerer for %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Succes -- tom overførsel" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Genstarter løkke" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Afhængighedsproces afslutter" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Succes - afhængigheder løst" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Kontrollerer afhængigheder for %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "søger efter %s som afhængighed for %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Kører compare_providers() for %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "bedre arkitektur i po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s overflødigør %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2229,142 +2349,142 @@ msgstr "" - "arkitekturdistribution sammenligner %s med %s på %s\n" - " Vinder: %s" + " Winner: %s" +-msgstr "" +-"arkitekturdistribution sammenligner %s med %s på %s\n" +-" Vinder: %s" ++msgstr "arkitekturdistribution sammenligner %s med %s på %s\n Vinder: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "normal kilde-RPM %s og %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "basepakke %s er installeret for %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "normal præfiks af %s mellem %s og %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "kræver minimalt: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Vinder: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Taber(med %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Bedste orden: %s" @@ -19831,20 +20162,23 @@ index a7202e2..dadbd91 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2372,21 +2492,21 @@ msgstr "" - "Der er uafsluttede overførsler tilbage. Du bør overveje at køre yum-" - "complete-transaction først for at afslutte dem." +-msgstr "" +-"Der er uafsluttede overførsler tilbage. Du bør overveje at køre yum-" +-"complete-transaction først for at afslutte dem." ++msgstr "Der er uafsluttede overførsler tilbage. Du bør overveje at køre yum-complete-transaction først for at afslutte dem." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 msgid "--> Finding unneeded leftover dependencies" - msgstr "" +-msgstr "" ++msgstr "--> Finder unødvendige afhængighedsrester" -#: ../yum/__init__.py:1041 +#: ../yum/__init__.py:1125 #, python-format msgid "Protected multilib versions: %s != %s" - msgstr "" +-msgstr "" ++msgstr "Beskyttede flerbiblioteksversioner: %s != %s" -#: ../yum/__init__.py:1096 +#: ../yum/__init__.py:1180 @@ -19857,9 +20191,10 @@ index a7202e2..dadbd91 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2394,89 +2514,92 @@ msgstr "" - "\n" - "Pakker sprunget over på grund af problemer med afhængigheder:" +-msgstr "" +-"\n" +-"Pakker sprunget over på grund af problemer med afhængigheder:" ++msgstr "\nPakker sprunget over på grund af problemer med afhængigheder:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -19872,9 +20207,10 @@ index a7202e2..dadbd91 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Fandt %d før-eksisterende rpmdb-problem(er), \"yum check\" giver " - "følgende:" +-msgstr "" +-"** Fandt %d før-eksisterende rpmdb-problem(er), \"yum check\" giver " +-"følgende:" ++msgstr "** Fandt %d før-eksisterende rpmdb-problem(er), \"yum check\" giver følgende:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -19895,8 +20231,9 @@ index a7202e2..dadbd91 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Advarsel: skriptlet eller andre ikke-fatale fejl opstod under overførslen." +-msgstr "" +-"Advarsel: skriptlet eller andre ikke-fatale fejl opstod under overførslen." ++msgstr "Advarsel: skriptlet eller andre ikke-fatale fejl opstod under overførslen." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -19918,7 +20255,7 @@ index a7202e2..dadbd91 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s skulle være blevet installeret, men det blev den ikke!" @@ -19929,24 +20266,22 @@ index a7202e2..dadbd91 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s skulle være blevet fjernet, men det blev den ikke!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Kunne ikke åbne lås %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Kunne ikke åbne lås %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Kunne ikke kontrollere om PID %s er aktiv" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Kunne ikke kontrollere om PID %s er aktiv" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -19956,38 +20291,52 @@ index a7202e2..dadbd91 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Kunne ikke oprette lås på %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Kunne ikke åbne lås %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Kunne ikke kontrollere om PID %s er aktiv" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2485,40 +2608,29 @@ msgstr "" - "Pakke matcher ikke den tænkte nedhentning. Forslag: kør yum --enablerepo=%s " - "clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Pakke matcher ikke den tænkte nedhentning. Forslag: kør yum --enablerepo=%s " +-"clean metadata" ++msgstr "Pakke matcher ikke den tænkte nedhentning. Forslag: kør yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Kunne ikke udføre checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Pakken matcher ikke checksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "pakken fejlede checksum, men mellemlagring er aktiveret for %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "bruger lokal kopi af %s" @@ -20004,700 +20353,737 @@ index a7202e2..dadbd91 100644 -" * behøvet %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Headerfil er ikke komplet." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2526,62 +2638,64 @@ msgstr "" - "Headerfil er ikke i lokal cache og kun-caching-tilstand er aktiveret. Kan " - "ikke hente %s" +-msgstr "" +-"Headerfil er ikke i lokal cache og kun-caching-tilstand er aktiveret. Kan " +-"ikke hente %s" ++msgstr "Headerfil er ikke i lokal cache og kun-caching-tilstand er aktiveret. Kan ikke hente %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Offentlig nøgle for %s er ikke installeret" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Kunne ikke åbne pakke %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Offentlig nøgle for %s er ikke sikker" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Pakken %s er ikke signeret" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Kan ikke fjerne %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s fjernet" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Kan ikke slette %s filen %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s filen %s er slettet" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s filer slettet" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d %s-fil fjernet" ++msgstr[1] "%d %s-filer fjernet" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mere end et identisk match i liste for %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ingen opdateringer matcher %s.%s %s:%s-%s" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2589,121 +2703,124 @@ msgstr "" - "searchPackages() vil forsvinde i en fremtidig version af Yum." - " Brug searchGenerator() istedet. \n" +-msgstr "" +-"searchPackages() vil forsvinde i en fremtidig version af Yum." +-" Brug searchGenerator() istedet. \n" ++msgstr "searchPackages() vil forsvinde i en fremtidig version af Yum. Brug searchGenerator() istedet. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Genemsøger %d pakker" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Søger %d pakke" ++msgstr[1] "Søger %d pakker" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "gennemsøger pakke %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "gennemsøger filopslag" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "søger efter afhængigheder" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Ingen tilgængelige gruppedata i konfigurerede pakkearkiver" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Gruppen %s findes ikke" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "pakken %s var ikke markeret i gruppen %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Tilføjer pakken %s fra gruppen %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Pakken %s er ikke tilgængelig til installation" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." - msgstr "" +-msgstr "" ++msgstr "Advarsel: Gruppe %s har ingen pakker." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." - msgstr "" +-msgstr "" ++msgstr "Gruppe %s har ingen %u konditionelle pakker, som måske installeres." #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" - msgstr "Pakken %s kunne ikke findes i pakkeliste" +-msgstr "Pakken %s kunne ikke findes i pakkeliste" ++msgstr "Pakkepar %s kunne ikke findes i pakkeliste" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Pakkepar %s kunne ikke findes i rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" - msgstr "" +-msgstr "" ++msgstr "Ugyldig versionsflag fra: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Ingen pakke fundet for %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Pakkeobjektet er ikke en pakkeobjektinstans" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Der er intet angivet til installation" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Kontrollerer for virtueludbyder eller filudbyder for %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Ingen match for argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Pakken %s installeret og ikke tilgængelig" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Ingen pakke(r) er tilgængelig(e) til installation" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakken: %s - allerede i overførselssættet" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Pakke %s er overflødiggjort af %s, som allerede er installeret" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2711,97 +2828,103 @@ msgid "" - msgstr "" - "Pakke %s er forældret af %s, men forældet pakke tilbyder ikke afhængigheder" + "requirements" +-msgstr "" +-"Pakke %s er forældret af %s, men forældet pakke tilbyder ikke afhængigheder" ++msgstr "Pakke %s er forældret af %s, men forældet pakke tilbyder ikke afhængigheder" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Pakke %s er overflødiggjort af %s, prøver at installere %s istedet" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakke %s er allerede installeret i den nyeste version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakken som matcher %s er allerede installeret. Søger efter opdatering." +-msgstr "" +-"Pakken som matcher %s er allerede installeret. Søger efter opdatering." ++msgstr "Pakken som matcher %s er allerede installeret. Søger efter opdatering." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Opdaterer alt" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, 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" ++msgstr "Ingen opdatering af pakke som allerede er overflødiggjort: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "" ++msgstr "Ingen pakke matchede til opgradering: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Pakke er allerede overflødiggjort: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Opdaterer ikke pakke som er blevet overflødiggjort: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "Ingen opdatering af pakke som allerede er overflødiggjort: %s.%s %s:%s-%s" +-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" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Ingen pakker fundet til fjernelse" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "" ++msgstr "Ingen pakke matchede til fjernelse: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Lader være med at køre kerne: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Fjerner %s fra overførslen" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Kan ikke åbne: %s. Springer over." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Undersøger %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Kan ikke lokalinstallere deltarpm: %s. Springer over." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Kan ikke tilføje pakke %s til overførsel. Ikke en kompatibel arkitektur: %s" +-msgstr "" +-"Kan ikke tilføje pakke %s til overførsel. Ikke en kompatibel arkitektur: %s" ++msgstr "Kan ikke tilføje pakke %s til overførsel. Ikke en kompatibel arkitektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Kan ikke installere pakke %s. Den er forældet af installeret pakke %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2810,137 +2933,144 @@ msgstr "" - "Pakken %s er ikke installeret, så den kan ikke opdateres. Kør yum install " - "for at installere den istedet." + "instead." +-msgstr "" +-"Pakken %s er ikke installeret, så den kan ikke opdateres. Kør yum install " +-"for at installere den istedet." ++msgstr "Pakken %s er ikke installeret, så den kan ikke opdateres. Kør yum install for at installere den istedet." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." - msgstr "" +-msgstr "" ++msgstr "Pakke %s.%s ikke installeret, kan ikke opdatere den. Kør yum install for at installere den i stedet." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Ekskluderer %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Markerer %s til installation" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Markerer %s som en opdatering til %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s kan ikke opdatere installeret pakke." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Kan ikke åbne fil: %s. Springer over." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem med geninstallation, ingen pakke fundet til at blive fjernet" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem med geninstallation: ingen pakke %s fundet til at installere" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Ingen pakke(r) er tilgængelig(e) til nedgradering" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakke %s er tilladt at have flere installationer, springer over" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Ingen match for tilgængelig pakke: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Opgradér kun tilgængelig på pakke: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" ++msgstr "Kunne ikke nedgradere: %s" ++ ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 ++#, python-format ++msgid "Failed to upgrade: %s" msgstr "Kunne ikke opgradere: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 -+#, python-format -+msgid "Failed to upgrade: %s" -+msgstr "" -+ -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" - msgstr "" +-msgstr "" ++msgstr "Henter nøgle fra %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Hentning af GPG-nøglen mislykkedes: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" +-msgstr "" ++msgstr "GPG-nøglesignatur ved nøgle %s matcher ikke CA-nøgle for pakkearkiv: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" - msgstr "" +-msgstr "" ++msgstr "GPG-nøglesignatur verificeret op mod CA-nøgle(r)" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Ugyldig GPG-nøgle fra %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Tolkning af GPG-nøgle mislykkedes: nøgle har ikke nogen værdi %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" +-msgstr "" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" Package : %s (%s)\n" +" From : %s" - msgstr "" ++msgstr "Importerer %s-nøgle 0x%s:\n Brugerid : \"%s\"\n Fingeraftryk: %s\n Pakke : %s (%s)\n Fra : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" +-msgstr "" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" - msgstr "" ++msgstr "Importerer %s-nøgle 0x%s:\n Brugerid : \"%s\"\n Fingeraftryk: %s\n Fra : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-nøgle på %s (0x%s) er allerede installeret" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Importering af nøgle mislykkedes (kode %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Nøglen blev importet med succes" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" - msgstr "" +-msgstr "" ++msgstr "Installerede ikke nogen nøgler" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2949,25 +3079,25 @@ msgstr "" - "GPG-nøglen er vist for \"%s\" pakkearkivet er allerede installeret, men den er ikke korrekt for denne pakke.\n" - "Kontrollér at konfigurationen af nøgle-URL'er er korrekt for denne kilde." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG-nøglen er vist for \"%s\" pakkearkivet er allerede installeret, men den er ikke korrekt for denne pakke.\n" +-"Kontrollér at konfigurationen af nøgle-URL'er er korrekt for denne kilde." ++msgstr "GPG-nøglen er vist for \"%s\" pakkearkivet er allerede installeret, men den er ikke korrekt for denne pakke.\nKontrollér at konfigurationen af nøgle-URL'er er korrekt for denne kilde." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Importering af nøgle(r) hjalp ikke, forkerte nøgle(r)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-nøgle på %s (0x%s) er allerede importeret" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Importering af nøgle mislykkedes" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" - msgstr "" +-msgstr "" ++msgstr "Installerede ikke nogen nøgler for pakkearkiv %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2976,159 +3106,183 @@ msgstr "" - "GPG-nøglen listet for pakkearkivet \"%s\" er allerede installeret, men de er ikke korrekte.\n" - "Kontrollér at de korrekte nøgle-url'er er konfigureret for dette pakkearkiv." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG-nøglen listet for pakkearkivet \"%s\" er allerede installeret, men de er ikke korrekte.\n" +-"Kontrollér at de korrekte nøgle-url'er er konfigureret for dette pakkearkiv." ++msgstr "GPG-nøglen listet for pakkearkivet \"%s\" er allerede installeret, men de er ikke korrekte.\nKontrollér at de korrekte nøgle-url'er er konfigureret for dette pakkearkiv." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Kunne ikke finde et passende filspejl." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Fejl blev fundet under hentning af pakker." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Rapportér venligst denne fejl på %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Fejl i testoverførslen: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Kunne ikke sætte mellemlagermappe: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" +-msgstr "" ++msgstr "Afhængigheder ikke løst. Vil ikke gemme uløst overførsel." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" - msgstr "" +-msgstr "" ++msgstr "Kunne ikke gemme overførselsfil %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" - msgstr "" +-msgstr "" ++msgstr "Kunne ikke få adgang til eller læse gemte overførsler %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " - msgstr "" +-msgstr "" ++msgstr "rpmdb version matchede ikke gemt overførselsversion, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." - msgstr "" +-msgstr "" ++msgstr " ignorerer, som forespurgt." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." - msgstr "" +-msgstr "" ++msgstr " afslutter." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." - msgstr "" +-msgstr "" ++msgstr "kan ikke finde tsflags eller tsflags ikke heltal." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" - msgstr "" +-msgstr "" ++msgstr "Fandt txmbr i nuværende ukendt status: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" - msgstr "" +-msgstr "" ++msgstr "Kunne ikke finde txmbr: %s i status %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" - msgstr "" +-msgstr "" ++msgstr "Kunne ikke finde txmbr: %s fra oprindelse: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," - msgstr "" +-msgstr "" ++msgstr "Overførselsmedlemmer, relationer mangler eller ts er blevet ændret," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" - msgstr "" - +-msgstr "" ++msgstr " ignorerer, som forespurgt. Du skal redepsolve!" ++ +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "" ++msgstr "%s er allerede blevet besøgt og kan ikke fjernes." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "" ++msgstr "Undersøger revdeps af %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "" ++msgstr "%s har revdep %s, som blev brugerinstalleret." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "" -+ ++msgstr "%s har ingen brugerinstallerede revdeps." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 +#: ../yum/plugins.py:212 @@ -20745,9 +21131,10 @@ index a7202e2..dadbd91 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "To eller flere udvidelsesmoduler med navnet \"%s\" er fundet i søgestien for" - " udvidelsesmoduler" +-msgstr "" +-"To eller flere udvidelsesmoduler med navnet \"%s\" er fundet i søgestien for" +-" udvidelsesmoduler" ++msgstr "To eller flere udvidelsesmoduler med navnet \"%s\" er fundet i søgestien for udvidelsesmoduler" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -20795,29 +21182,47 @@ index a7202e2..dadbd91 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s giver %s men kan ikke findes" -@@ -3137,6 +3291,17 @@ msgstr "%s giver %s men kan ikke findes" +@@ -3137,6 +3203,19 @@ msgstr "%s giver %s men kan ikke findes" msgid "Repackaging" msgstr "Genpakning" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Verificér: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Ikke plads nok i nedhentningskataloget %s\n" -+" * fri %s\n" -+" * behøvet %s" ++msgstr "Ikke plads nok i nedhentningskataloget %s\n * fri %s\n * behøvet %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3149,8 +3228,7 @@ msgstr "RPM %s fejlede md5-kontrol" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Kunne ikke åbne RPM-database til læsning. Måske er den allerede i brug?" ++msgstr "Kunne ikke åbne RPM-database til læsning. Måske er den allerede i brug?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3166,5 +3244,3 @@ msgstr "Ødelagt headerfil %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Fejl ved åbning af RPM %s - fejl %s" +- +- diff --git a/po/de.po b/po/de.po -index fa39cb0..60a16fa 100644 +index fa39cb0..9a77372 100644 --- a/po/de.po +++ b/po/de.po -@@ -2,16 +2,18 @@ +@@ -2,947 +2,961 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -20832,22 +21237,24 @@ index fa39cb0..60a16fa 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: German (http://www.transifex.net/projects/p/yum/team/de/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: German (http://www.transifex.net/projects/p/yum/team/de/)\n" ++"Language-Team: German (http://www.transifex.net/projects/p/yum/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -19,124 +21,128 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Aktualisieren" @@ -20858,31 +21265,31 @@ index fa39cb0..60a16fa 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installieren" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Veraltet" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Aktualisiert" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Gelöscht" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Installiert" @@ -20909,7 +21316,7 @@ index fa39cb0..60a16fa 100644 msgstr "Gelöscht: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Entfernen" @@ -20919,180 +21326,181 @@ index fa39cb0..60a16fa 100644 msgstr "Aufräumen" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Befehl \"%s\" ist bereits definiert" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Repositories werden eingerichtet" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Lese Repository-Metadaten aus lokalen Dateien ein" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurationsfehler: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Optionenfehler: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installiert: %s-%s am %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Gebaut : %s am %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Übermittelt: %s am %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Sie müssen irgendeinen Befehl eingeben" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Kein solcher Befehl: %s. Bitte %s --help verwenden." -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Festplattenplatz-Anforderungen:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" +-" Mindestens %dMB zusätzlicher Speicherplatz wird auf dem Dateisystem %s " +-"benötigt.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" +msgstr[0] "" -+" Mindestens %dMB zusätzlicher Speicherplatz wird auf dem Dateisystem %s " -+"benötigt.\n" -+msgstr[1] "" - " Mindestens %dMB zusätzlicher Speicherplatz wird auf dem Dateisystem %s " - "benötigt.\n" ++msgstr[1] " Mindestens %dMB zusätzlicher Speicherplatz wird auf dem Dateisystem %s benötigt.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -144,61 +150,61 @@ msgstr "" - "Fehler-Zusammenfassung\n" - "----------------------\n" +-msgstr "" +-"Fehler-Zusammenfassung\n" +-"----------------------\n" ++msgstr "Fehler-Zusammenfassung\n----------------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Versuche Transaktion auszuführen, aber es ist nichts zu tun. Beende." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Beende nach Befehl des Benutzers" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Lade Pakete herunter:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Fehler beim Herunterladen der Pakete:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" - msgstr "" - "FEHLER Sie müssen RPM aktualisieren, damit es mit Folgendem umgehen kann:" +-msgstr "" +-"FEHLER Sie müssen RPM aktualisieren, damit es mit Folgendem umgehen kann:" ++msgstr "FEHLER Sie müssen RPM aktualisieren, damit es mit Folgendem umgehen kann:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM muss aktualisiert werden" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Bitte melden Sie diesen Fehler unter %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Führe Verarbeitungstest durch" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Prüffehler bei Verarbeitung:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Verarbeitungstest erfolgreich" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Führe Verarbeitung durch" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -206,237 +212,260 @@ msgstr "" - "Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt ausgeführt.\n" - "Benutze \"-y\" zum Überschreiben." +-msgstr "" +-"Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt ausgeführt.\n" +-"Benutze \"-y\" zum Überschreiben." ++msgstr "Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt ausgeführt.\nBenutze \"-y\" zum Überschreiben." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Meinten Sie vielleicht:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paket(e) %s%s%s verfügbar, aber nicht installiert." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Kein Paket %s%s%s verfügbar." @@ -21100,7 +21508,7 @@ index fa39cb0..60a16fa 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket(e) zum Installieren" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -21109,13 +21517,13 @@ index fa39cb0..60a16fa 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nichts zu tun" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d Pakete zur Aktualisierung markiert" @@ -21125,12 +21533,12 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Keine Pakete für die Aktualisierung markiert" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -21140,12 +21548,12 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d Pakete für die Entfernung markiert" @@ -21155,14 +21563,14 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Keine Pakete für die Entfernung markiert" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paket(e) zum Downgrade" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -21170,13 +21578,13 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (von %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installiertes Paket %s%s%s%s nicht verfügbar." @@ -21184,7 +21592,7 @@ index fa39cb0..60a16fa 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket(e) zum Neuinstallieren" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -21192,153 +21600,154 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Keine Pakete bereitgestellt" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paket(e) zum Installieren" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Treffer: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Warnung: Keine Übereinstimmung gefunden für: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Keine Übereinstimmungen gefunden" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Kein Paket gefunden für %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Räume Repos auf:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Räume alles auf" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Räume Header auf" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Räume Pakete auf" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Räume XML-Metadaten auf" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Räume Datenbank-Speicher auf" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Räume Metadaten für abgelaufene Caches auf" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Räume Plugins auf" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Installierte Gruppen:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Verfügbare Gruppen:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Fertig" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Warnung: Gruppe %s existiert nicht." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder " - "Aktualisieren" +-msgstr "" +-"Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder " +-"Aktualisieren" ++msgstr "Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder Aktualisieren" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Paket(e) zum Installieren" @@ -21348,18 +21757,18 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Es existiert keine Gruppe mit dem Namen %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Keine Pakete zum Entfernen aus dem Gruppen gefunden" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Paket(e) zum Entfernen" @@ -21369,602 +21778,614 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s ist bereits installiert, überspringen" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, 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:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, 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" ++msgstr "Kein anderes %s installiert, füge es zur Liste für eine potentielle Installation hinzu" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Plugin-Optionen" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Kommandozeilen-Fehler: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -447,285 +476,289 @@ msgstr "" "\n" - "%s: %s Option benötigt ein Argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s Option benötigt ein Argument" ++msgstr "\n\n%s: %s Option benötigt ein Argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color kann einen der folgenden Werte haben: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "Hilfeinformation anzeigen und beenden" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "fehlertolerant sein" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" - msgstr "" - "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht" +-msgstr "" +-"laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht" ++msgstr "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "Ort der Konfigurationsdatei" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maximale Befehlswartezeit" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "Debugging-Ausgabe-Stufe" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "Duplikate, in Repos und in Listen/Suchen-Befehlen, anzeigen" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "Fehler-Ausgabe-Stufe" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "Stufe der Debugging-Ausgabe für rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "Stiller Betrieb" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "Wortreicher Betrieb" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "Beantwortet alle Fragen mit 'ja'" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "Yum-Version anzeigen und Programm beenden" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "Wurzel-Installationsverzeichnis setzen" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "aktiviere ein oder mehrere Repositories (Wildcards erlaubt)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "deaktiviere ein oder mehrere Repositories (Wildcards erlaubt)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "schliesse Paket(e) nach Namen oder global aus" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "deaktiviere Ausschluss von 'main', einem Repository oder allem" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "aktiviere veraltetes Verarbeiten während Aktualisierung" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "deaktiviere Yum-Plugins" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "deaktiviere GPG-Signatur-Prüfung" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "deaktiviere Plugins nach Namen" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "aktiviere Plugins nach Namen" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "überspringe Pakete mit Abhängigkeitsauflösungsproblemen" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontrolliert, ob Farbe benutzt wird" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mär" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Mai" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Aug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Okt" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Dez" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Versuche anderen Spiegel-Server." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Name : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Architektur : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Version : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Ausgabe : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Größe : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repo : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Aus repo : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Übermittler : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Übermittlungszeit : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Build-Zeit : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Installationszeit: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Installiert von: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Verändert von : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Zusammenfassung : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Lizenz : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Beschreibung : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "j" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ja" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "nein" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Ist dies in Ordnung? [j/N] :" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -734,154 +767,156 @@ msgstr "" - "\n" - "Gruppe: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Gruppe: %s" ++msgstr "\nGruppe: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Gruppen-ID: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Beschreibung: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr "Sprache: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Obligatorische Pakete:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Standard-Pakete:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Optionale Pakete:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Zwangsbedingte Pakete:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "Paket: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Keine Abhängigkeiten für dieses Paket" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " Abhängigkeit: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Nicht erfüllte Abhängigkeit" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Übereinstimmung von:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Lizenz : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Dateiname : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Andere : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Fehler beim Berechnen der Gesamtgröße der Downloads" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Gesamtgröße: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Gesamte Downloadgröße: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Installationsgröße: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Fehler beim Berechnen der Installationsgröße" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Neuinstallieren" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Downgrading" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Als Abhängigkeiten installiert" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Aktualisiert für Abhängigkeiten" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Entfernt für Abhängigkeiten" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Übersprungen (Abhängigkeitsprobleme)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Nicht installiert" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Nicht verfügbar" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" -+msgstr[0] "Paket" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Paket" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arch" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Version" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repository" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Größe" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " ersetzt %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -892,57 +927,58 @@ msgstr "" - "Vorgangsübersicht\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Vorgangsübersicht\n" +-"%s\n" ++msgstr "\nVorgangsübersicht\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) installieren\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Installieren" @@ -21972,7 +22393,7 @@ index fa39cb0..60a16fa 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) aktualisieren\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -21980,7 +22401,7 @@ index fa39cb0..60a16fa 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) entfernen\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -21988,335 +22409,339 @@ index fa39cb0..60a16fa 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "%5.5s Paket(e) reinstallieren\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Entfernt" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Abhängigkeiten entfernt" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Abhängigkeit installiert" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Abhängigkeit aktualisiert" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Ersetzt " -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Fehlgeschlagen" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "zwei" -@@ -950,7 +986,7 @@ msgstr "zwei" +@@ -950,562 +964,598 @@ msgstr "zwei" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -961,364 +997,416 @@ msgstr "" - " Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s innerhalb %s%s%s Sekunden\n" - "zum Beenden.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s innerhalb %s%s%s Sekunden\n" +-"zum Beenden.\n" ++msgstr "\n Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s innerhalb %s%s%s Sekunden\nzum Beenden.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "Benutzer-Unterbrechung" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Gesamt" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" -msgstr "" +msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Schlechte Transaktions-IDs oder Paket(e) angegeben" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "Kommandozeile" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Angemeldeter Benutzer" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Datum und Zeit" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Aktion(en)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Verändert" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Keine Transaktions-ID angegeben" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Schlechte Transaktions-ID angegeben" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Angebene Transaktions-ID nicht gefunden" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Mehr als eine Transaktions-ID gefunden!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Keine Transaktions-ID oder Paket angegeben" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Älter" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Neuer" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Transaktions-ID :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Anfangszeit :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Anfang rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u Sekunden)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u Minuten)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u Stunden)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u Tage)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Endzeit :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Ende rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Benutzer :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Rückgabe-Code :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Erfolg" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Veränderte Pakete:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Übersprungene Pakete:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Fehler:" @@ -22325,17 +22750,17 @@ index fa39cb0..60a16fa 100644 -msgstr "Installieren" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Löschen" @@ -22348,296 +22773,310 @@ index fa39cb0..60a16fa 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Zeit" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Gestern" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Letzte Woche" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "In den letzten 2 Wochen" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "In den letzten 3 Monaten" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "In den letzten 6 Monaten" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Letztes Jahr" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Vor über einem Jahr" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Keine Transaktion %s gefunden" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Transaktions-ID" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Verfügbare zusätzliche Verlaufsinformationen" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Keine zusätzlichen Daten zu diesem Namen gefunden" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installiert" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "gelöscht" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "reinstalliert" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "aktualisiert" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "veraltet" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paket %s.%s %s:%s-%s markiert, um %s zu werden" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Führe Transaktionsprüfung aus" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Starte Abhängigkeitsauflösung mit den neuen Änderungen neu." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Abhängigkeitsauflösung beendet" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Verarbeite Abhängigkeiten: %s für Paket: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Behalte Paket: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nicht aufgelöste Abhängigkeit: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paket: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1327,7 +1415,7 @@ msgstr "" - "\n" - " Benötigt: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Benötigt: %s" ++msgstr "\n Benötigt: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1336,7 +1424,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1345,7 +1433,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1354,85 +1442,85 @@ msgstr "" - " Nicht gefunden" +-msgstr "" +-"\n" +-" Nicht gefunden" ++msgstr "\n Nicht gefunden" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Aktualisiert durch" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Überholt durch" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Verfügbar" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Verarbeite Konflikt: %s kollidiert mit %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Fülle Verarbeitungsset mit ausgewählten Paketen. Bitte warten." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Lade Header für %s herunter, um ins Verarbeitungsset zu packen." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Läuft" @@ -22663,7 +23102,7 @@ index fa39cb0..60a16fa 100644 msgstr "Verfolgt/Gestoppt" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Unbekannt" @@ -22701,27 +23140,37 @@ index fa39cb0..60a16fa 100644 msgid "" "\n" "\n" -@@ -1442,7 +1530,7 @@ msgstr "" - "\n" - "Beende nach Abbruch durch den Benutzer" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Beende nach Abbruch durch den Benutzer" ++msgstr "\n\nBeende nach Abbruch durch den Benutzer" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1452,7 +1540,7 @@ msgstr "" - "\n" - "Beende wegen defekter Pipe" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Beende wegen defekter Pipe" ++msgstr "\n\nBeende wegen defekter Pipe" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1463,41 +1551,41 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -22769,16 +23218,17 @@ index fa39cb0..60a16fa 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1505,7 +1593,7 @@ msgstr "" - "\n" - "Abhängigkeiten aufgelöst" +-msgstr "" +-"\n" +-"Abhängigkeiten aufgelöst" ++msgstr "\nAbhängigkeiten aufgelöst" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Komplett!" -@@ -1517,7 +1605,7 @@ msgstr "" +@@ -1517,7 +1567,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Sie müssen root sein, um diesen Befehl ausführen zu können." @@ -22787,9 +23237,25 @@ index fa39cb0..60a16fa 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1547,53 +1635,53 @@ msgstr "" +@@ -1532,479 +1582,482 @@ msgid "" + "will install it for you.\n" "\n" - "Für weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-Anbieter.\n" + "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" +-"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, welchen Sie benutzen wollen\n" +-"für ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich\n" +-"angeben, und yum wird ihn für Sie installieren.\n" +-"\n" +-"Für weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-Anbieter.\n" ++msgstr "\nSie haben das Überprüfen der Pakete via GPG-Schlüssel aktiviert. Dies ist eine gute Sache. \nAllerdings haben Sie nicht alle öffentlichen GPG-Schlüssel installiert. Sie müssen die\ngewünschten Schlüssel für die Pakete herunterladen und installieren.\nSie können dies mit folgendem Befehl machen:\n rpm --import public.gpg.key\n\n\nAlternativ könnten Sie den URL zum Schlüssel, welchen Sie benutzen wollen\nfür ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich\nangeben, und yum wird ihn für Sie installieren.\n\nFür weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-Anbieter.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -22852,9 +23318,12 @@ index fa39cb0..60a16fa 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1603,309 +1691,298 @@ msgstr "" - "Führen sie \"yum repolist all\" aus, um zu sehen, welche repos sie haben.\n" - "Sie können repos mit yum-config-manager --enable aktivieren" + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Es gibt keine aktivierten repos.\n" +-"Führen sie \"yum repolist all\" aus, um zu sehen, welche repos sie haben.\n" +-"Sie können repos mit yum-config-manager --enable aktivieren" ++msgstr "Es gibt keine aktivierten repos.\nFühren sie \"yum repolist all\" aus, um zu sehen, welche repos sie haben.\nSie können repos mit yum-config-manager --enable aktivieren" -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -22889,8 +23358,9 @@ index fa39cb0..60a16fa 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "Installierte Pakete auf die neuesten verfügbaren Versionen synchronisieren" +-msgstr "" +-"Installierte Pakete auf die neuesten verfügbaren Versionen synchronisieren" ++msgstr "Installierte Pakete auf die neuesten verfügbaren Versionen synchronisieren" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -23000,9 +23470,10 @@ index fa39cb0..60a16fa 100644 -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "Dies kann eine Weile dauern, abhängig von der Geschwindigkeit dieses " - "Computers" +-msgstr "" +-"Dies kann eine Weile dauern, abhängig von der Geschwindigkeit dieses " +-"Computers" ++msgstr "Dies kann eine Weile dauern, abhängig von der Geschwindigkeit dieses Computers" -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -23089,336 +23560,342 @@ index fa39cb0..60a16fa 100644 msgstr "Zeige die konfigurierten Software-Repositories an" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "aktiviert" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "deaktiviert" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Repo-Revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-Distro-Tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Repo aktualisiert : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Repo-Größe : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-Metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Aktualisiert : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Repo-Spiegel : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Nie (zuletzt: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s Sekunde(n) (zuletzt: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-ausgeschlossen : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-eingeschlossen : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Repo-ausgeschlossen: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "Repo-ID" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "Status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "Repo-Name:" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Zeigt eine kurze Verwendungsinformation" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Keine Hilfe für %s vorhanden" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1915,7 +1992,7 @@ msgstr "" - "\n" - "Aliase: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"Aliase: " ++msgstr "\n\nAliase: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1925,86 +2002,126 @@ msgstr "" - "\n" - "Alias: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"Alias: " ++msgstr "\n\nAlias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Einrichten des Neuinstallationsprozess" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "Installiere Paket neu" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Einrichten des Downgrade-Prozesses" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "Downgrade eines Pakets" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." - msgstr "" - "Eine Version für das System und/oder die verfügbaren Repositories anzeigen." +-msgstr "" +-"Eine Version für das System und/oder die verfügbaren Repositories anzeigen." ++msgstr "Eine Version für das System und/oder die verfügbaren Repositories anzeigen." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Gruppe :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Pakete:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Installiert:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Gruppe-installiert:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Verfügbar:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Gruppe-verfügbar:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Übertragungsverlauf anzeigen oder verwenden" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2015,28 +2132,34 @@ msgstr "" +@@ -2015,106 +2068,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." msgstr "" - "Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet wird " - "..." +-"Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet wird " +-"..." -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet wird ..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -23439,278 +23916,285 @@ index fa39cb0..60a16fa 100644 msgid "" "\n" "\n" -@@ -2046,75 +2169,75 @@ msgstr "" - "\n" - "Verlasse nach Abbruch durch den Benutzer." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Verlasse nach Abbruch durch den Benutzer." ++msgstr "\n\nVerlasse nach Abbruch durch den Benutzer." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() wird in zukünftigen Versionen von Yum verschwinden.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" - msgstr "" - "Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist" +-msgstr "" +-"Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist" ++msgstr "Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Ungültiges tsflag in Konfigurationsdatei: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Suche pkgSack für Abhängigkeiten: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Mitglied: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s konvertiert zum Installieren" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Füge Paket %s hinzu in Modus %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Entferne Paket %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s benötigt: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s benötigt %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Benötigte Anforderung wurde bereits nachgeschlagen, betrüge" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Benötigte Anforderung ist kein Paket-Name. Schlage nach: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Potentieller Anbieter: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Modus ist %s für Anbieter von %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modus für pkg-Bereitstellung %s: %s" -@@ -2122,115 +2245,115 @@ msgstr "Modus für pkg-Bereitstellung %s: %s" +@@ -2122,1032 +2175,1029 @@ msgstr "Modus für pkg-Bereitstellung %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s Paket benötigt %s, welches als gelöscht markiert ist" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Ersetze %s durch %s zum Auflösen der Abhängigkeit." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Aktualisiere %s zum Auflösen der Abhängigkeit." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Kann keinen Aktualisierungspfad finden für Abhängigkeit für: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Übereinstimmung von %s, welche gebraucht wird für %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, 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." ++msgstr "%s ist in einem bereitgestellten Paket, aber bereits installiert, entferne." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potentielles aufgelöstes Paket %s hat eine neuere Instanz in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, 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:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s bereits in ts, überspringe dieses" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Markiere %s als Aktualisierung für %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Markiere %s als Installation für %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Erfolg - Leere Transaktion" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Starte Schleife neu" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Abhängigkeitsverarbeitung beendet" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Erfolg - Abhängigkeiten aufgelöst" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Prüfe Abhängigkeiten für %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "Suche nach %s als eine Anforderung von %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Führe compare_providers() aus für %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "bessere Architektur in po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s ersetzt %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2239,142 +2362,142 @@ msgstr "" - "archdist verglichen %s zu %s auf %s\n" - " Gewinner: %s" + " Winner: %s" +-msgstr "" +-"archdist verglichen %s zu %s auf %s\n" +-" Gewinner: %s" ++msgstr "archdist verglichen %s zu %s auf %s\n Gewinner: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "Gemeinsames Quellen-RPM %s und %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "Gemeinsamer Prefix von %s zwischen %s und %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Beste Bestellung: %s" @@ -23843,9 +24327,11 @@ index fa39cb0..60a16fa 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2383,21 +2506,21 @@ msgstr "" - "ziehen, zuerst yum-complete-transaction auszuführen, um diese " - "abzuschliessen." +-msgstr "" +-"Es gibt noch nicht abgeschlossene Transaktionen. Sie sollten in Betracht " +-"ziehen, zuerst yum-complete-transaction auszuführen, um diese " +-"abzuschliessen." ++msgstr "Es gibt noch nicht abgeschlossene Transaktionen. Sie sollten in Betracht ziehen, zuerst yum-complete-transaction auszuführen, um diese abzuschliessen." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -23869,9 +24355,10 @@ index fa39cb0..60a16fa 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2405,90 +2528,93 @@ msgstr "" - "\n" - "Pakete übersprungen wegen Abhängigkeitsproblemen:" +-msgstr "" +-"\n" +-"Pakete übersprungen wegen Abhängigkeitsproblemen:" ++msgstr "\nPakete übersprungen wegen Abhängigkeitsproblemen:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -23884,9 +24371,10 @@ index fa39cb0..60a16fa 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** %d bereits bestehende(s) rpmdb Problem(e) gefunden, 'yum check' gibt " - "Folgendes aus: " +-msgstr "" +-"** %d bereits bestehende(s) rpmdb Problem(e) gefunden, 'yum check' gibt " +-"Folgendes aus: " ++msgstr "** %d bereits bestehende(s) rpmdb Problem(e) gefunden, 'yum check' gibt Folgendes aus: " -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -23907,9 +24395,10 @@ index fa39cb0..60a16fa 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der " - "Verarbeitung aufgetreten." +-msgstr "" +-"Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der " +-"Verarbeitung aufgetreten." ++msgstr "Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der Verarbeitung aufgetreten." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -23931,7 +24420,7 @@ index fa39cb0..60a16fa 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s hätte installiert werden sollen, wurde aber nicht!" @@ -23942,24 +24431,22 @@ index fa39cb0..60a16fa 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s hätte entfernt werden sollen, wurde aber nicht!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Konnte Sperrung %s nicht aufheben: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Konnte Sperrung %s nicht aufheben: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Unfähig zu prüfen, ob PID %s ist aktiv" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Unfähig zu prüfen, ob PID %s ist aktiv" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -23969,40 +24456,55 @@ index fa39cb0..60a16fa 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Konnte keine Sperrung bei %s erstellen: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Konnte Sperrung %s nicht aufheben: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Unfähig zu prüfen, ob PID %s ist aktiv" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2497,42 +2623,31 @@ msgstr "" - "Paket stimmt nicht mit dem beabsichtigten Download überein. Vorschlag: " - "starten sie yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Paket stimmt nicht mit dem beabsichtigten Download überein. Vorschlag: " +-"starten sie yum --enablerepo=%s clean metadata" ++msgstr "Paket stimmt nicht mit dem beabsichtigten Download überein. Vorschlag: starten sie yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Konnte Prüfsumme nicht bilden" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Paket stimmt nicht mit der Prüfsumme überein" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "Paket bei Prüfsummen-Prüfung durchgefallen, aber Zwischenspeicherung ist " - "aktiviert für %s" +-msgstr "" +-"Paket bei Prüfsummen-Prüfung durchgefallen, aber Zwischenspeicherung ist " +-"aktiviert für %s" ++msgstr "Paket bei Prüfsummen-Prüfung durchgefallen, aber Zwischenspeicherung ist aktiviert für %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "benutze lokale Kopie von %s" @@ -24019,69 +24521,70 @@ index fa39cb0..60a16fa 100644 -" * benötigt %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Header ist nicht vollständig." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2540,62 +2655,64 @@ msgstr "" - "Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus " - "aktiviert. Kann %s nicht herunterladen" +-msgstr "" +-"Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus " +-"aktiviert. Kann %s nicht herunterladen" ++msgstr "Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus aktiviert. Kann %s nicht herunterladen" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Öffentlicher Schlüssel für %s ist nicht installiert" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problem beim Öffnen des Paketes %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Öffentlicher Schlüssel für %s ist nicht vertrauenswürdig" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Paket %s ist nicht unterschrieben" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Kann %s nicht entfernen" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s entfernt" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Kann %s Datei nicht entfernen %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s Datei %s entfernt" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s Dateien entfernt" @@ -24091,28 +24594,29 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, 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:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Keine Übereinstimmungen mit %s.%s %s:%s-%s bei der Aktualisierung" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2603,140 +2720,143 @@ msgstr "" - "searchPackages() wird in zukünftigen Versionen von Yum verschwinden." - " Benutze stattdessen searchGenerator(). \n" +-msgstr "" +-"searchPackages() wird in zukünftigen Versionen von Yum verschwinden." +-" Benutze stattdessen searchGenerator(). \n" ++msgstr "searchPackages() wird in zukünftigen Versionen von Yum verschwinden. Benutze stattdessen searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Suche %d Pakete" @@ -24122,62 +24626,62 @@ index fa39cb0..60a16fa 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "Suche Paket %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "Suche in Datei-Einträgen" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "suche in bereitgestellten Einträgen" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Keine Gruppendaten für konfigurierte Repositories verfügbar" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Kein Gruppe mit dem Namen %s vorhanden" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "Paket %s war nicht markiert in Gruppe %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Füge Paket %s aus Gruppe %s hinzu" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Kein Paket mit Namen %s verfügbar zum Installieren" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -24185,80 +24689,81 @@ index fa39cb0..60a16fa 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Paket-Tupel %s kann nicht gefunden werden im Paket-Behälter" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Kein Paket gefunden für %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Paketobjekt war keine Paketobjektinstanz" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Nichts angegeben zum Installieren" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, 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" ++msgstr "Überprüfe nach virtueller Bereitstellung oder Datei-Bereitstellung für %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Kein Übereinstimmung für Argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Paket %s installiert und nicht verfügbar" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Kein(e) Paket(e) zum Installieren verfügbar." -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paket: %s - bereits im Transaktionsset" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paket %s wurde ersetzt durch %s, welches bereits installiert ist" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -24266,136 +24771,143 @@ index fa39cb0..60a16fa 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren." +-msgstr "" +-"Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren." ++msgstr "Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren." -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Paket %s ist bereits in der neusten Version installiert." -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" -@@ -2744,67 +2864,73 @@ msgstr "" - "Aktualisierung." +-msgstr "" +-"Paket, das auf %s passt, ist bereits installiert. Überprüfe auf " +-"Aktualisierung." ++msgstr "Paket, das auf %s passt, ist bereits installiert. Überprüfe auf Aktualisierung." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Aktualisiere alles" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, 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:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "Aktualisiere Paket nicht, da es bereits aktualisiert ist: %s.%s %s:%s-%s" +-msgstr "" +-"Aktualisiere Paket nicht, da es bereits aktualisiert ist: %s.%s %s:%s-%s" ++msgstr "Aktualisiere Paket nicht, da es bereits aktualisiert ist: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Kein Paket stimmt zum Entfernen überein" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Überspringe den laufenden Kernel: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Entferne %s aus der Transaktion." -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Konnte nicht öffnen: %s. Überspringe." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Untersuche %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Konnte deltarpm nicht lokal installieren: %s. Überspringe." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2812,14 +2938,14 @@ msgstr "" - "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible " - "Architektur: %s" +-msgstr "" +-"Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible " +-"Architektur: %s" ++msgstr "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible Architektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Konnte Paket %s nicht installieren. Es ist vom installierten Paket %s " - "überholt" +-msgstr "" +-"Konnte Paket %s nicht installieren. Es ist vom installierten Paket %s " +-"überholt" ++msgstr "Konnte Paket %s nicht installieren. Es ist vom installierten Paket %s überholt" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2828,139 +2954,146 @@ msgstr "" - "Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie " - "stattdessen yum install aus, um es zu installieren." + "instead." +-msgstr "" +-"Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie " +-"stattdessen yum install aus, um es zu installieren." ++msgstr "Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie stattdessen yum install aus, um es zu installieren." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -24403,120 +24915,122 @@ index fa39cb0..60a16fa 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Schliesse %s aus" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Markiere %s zum Installieren" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Markiere %s als eine Aktualisierung für %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: aktualisiert installierte Pakete nicht." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Kann Datei nicht öffnen: %s. Überspringe." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein" +-msgstr "" +-"Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein" ++msgstr "Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Probleme beim Neuinstallieren: kein Paket %s stimmt zum Installieren überein" +-msgstr "" +-"Probleme beim Neuinstallieren: kein Paket %s stimmt zum Installieren überein" ++msgstr "Probleme beim Neuinstallieren: kein Paket %s stimmt zum Installieren überein" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Kein(e) Paket(e) zum Downgrade verfügbar" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paket %s darf mehrfach installiert sein, überspringe" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Keine Übereinstimmung der verfügbare Pakete: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Nur verfügbare Paket aktualisieren: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG-Schlüssel-Abruf fehlgeschlagen:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Ungültiger GPG-Schlüssel von %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG-Schlüssel-Analyse fehlgeschlagen: Schlüssel hat keinen Wert %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -24530,7 +25044,7 @@ index fa39cb0..60a16fa 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -24542,179 +25056,184 @@ index fa39cb0..60a16fa 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits installiert" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Schlüssel-Import fehlgeschlagen (Code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Schlüssel erfolgreich importiert" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2969,25 +3102,25 @@ msgstr "" - "Die aufgelisteten GPG-Schlüssel für das \"%s\"-Repository sind bereits installiert, aber sie sind nicht korrekt für dieses Paket.\n" - "Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Die aufgelisteten GPG-Schlüssel für das \"%s\"-Repository sind bereits installiert, aber sie sind nicht korrekt für dieses Paket.\n" +-"Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind." ++msgstr "Die aufgelisteten GPG-Schlüssel für das \"%s\"-Repository sind bereits installiert, aber sie sind nicht korrekt für dieses Paket.\nStellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Importieren der Schlüssel hat nicht geholfen, falsche Schlüssel?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits importiert" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Schlüssel-Import fehlgeschlagen" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2997,157 +3130,181 @@ msgstr "" - "installiert, aber nicht korrekt. Überprüfen sie, ob die korrekten Schlüssel-" - "URLs für dieses Repository konfiguriert sind." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Die aufgelisteten GPG-Schlüssel für das \"%s\" Repository sind bereits " +-"installiert, aber nicht korrekt. Überprüfen sie, ob die korrekten Schlüssel-" +-"URLs für dieses Repository konfiguriert sind." ++msgstr "Die aufgelisteten GPG-Schlüssel für das \"%s\" Repository sind bereits installiert, aber nicht korrekt. Überprüfen sie, ob die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Es kann kein geeigneten Spiegelserver gefunden werden." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Bitte melden Sie diesen Fehler unter %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Test-Transaktionsfehler: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Konnte Verzeichnis für Zwischenspeicher nicht festlegen: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -24814,54 +25333,71 @@ index fa39cb0..60a16fa 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s stellt %s bereit, aber es konnte nicht gefunden werden" -@@ -3156,6 +3313,17 @@ msgstr "%s stellt %s bereit, aber es konnte nicht gefunden werden" +@@ -3156,11 +3206,23 @@ msgstr "%s stellt %s bereit, aber es konnte nicht gefunden werden" msgid "Repackaging" msgstr "Packe neu" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Nicht genügend Platz im Download-Verzeichnis %s vorhanden\n" -+" * frei %s\n" -+" * benötigt %s" ++msgstr "Nicht genügend Platz im Download-Verzeichnis %s vorhanden\n * frei %s\n * benötigt %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +-msgstr "" +-"Header kann nicht geöffnet werden oder stimmt nicht überein mit %s, %s." ++msgstr "Header kann nicht geöffnet werden oder stimmt nicht überein mit %s, %s." + + #: ../rpmUtils/oldUtils.py:53 + #, python-format +@@ -3185,5 +3247,3 @@ msgstr "Defekter Header %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Fehler bei Öffnen des RPM %s - Fehler %s" +- +- diff --git a/po/el.po b/po/el.po -index 8df34e7..82146d6 100644 +index 8df34e7..fe93744 100644 --- a/po/el.po +++ b/po/el.po -@@ -2,14 +2,15 @@ +@@ -2,428 +2,455 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Dimitris Glezos , 2011 +# Translators: ++# , 2011. +# Dimitris Glezos , 2011. msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" -+"Last-Translator: james \n" - "Language-Team: Greek (http://www.transifex.net/projects/p/yum/team/el/)\n" +-"Language-Team: Greek (http://www.transifex.net/projects/p/yum/team/el/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-04 14:53+0000\n" ++"Last-Translator: Argyris Zardilis \n" ++"Language-Team: Greek (http://www.transifex.net/projects/p/yum/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,413 +18,438 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Ενημέρωση" @@ -24872,31 +25408,31 @@ index 8df34e7..82146d6 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Εγκατάσταση" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Ενημερώθηκε" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Διαγράφηκε" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Εγκαταστάθηκε" @@ -24923,7 +25459,7 @@ index 8df34e7..82146d6 100644 msgstr "Διαγράφηκε:%s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Γίνεται αφαίρεση" @@ -24933,69 +25469,69 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -25006,98 +25542,98 @@ index 8df34e7..82146d6 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -25105,7 +25641,7 @@ index 8df34e7..82146d6 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -25114,13 +25650,13 @@ index 8df34e7..82146d6 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -25130,12 +25666,12 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -25145,12 +25681,12 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -25160,14 +25696,14 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -25175,21 +25711,23 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" - msgstr "" +-msgstr "" ++msgstr "(από %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." - msgstr "" +-msgstr "" ++msgstr "Το εγκατεστημένο πακέτο %s%s%s%s δεν είναι διαθέσιμο." -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -25197,151 +25735,153 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" -+msgstr "" ++msgstr "Πακέτο(α) για εγκατάσταση" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" - msgstr "" +-msgstr "" ++msgstr "Εγκατεστημένες ομάδες:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" - msgstr "" +-msgstr "" ++msgstr "Διαθέσιμες ομάδες:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -25351,18 +25891,18 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -25372,550 +25912,565 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -431,438 +457,444 @@ msgid "" +@@ -431,438 +458,444 @@ msgid "" "%s: %s option requires an argument" msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" - msgstr "" +-msgstr "" ++msgstr "ανώτατος χρόνος αναμονής για εντολή" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" - msgstr "" +-msgstr "" ++msgstr "Όνομα : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" - msgstr "" +-msgstr "" ++msgstr "Μέγεθος : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" - msgstr "" +-msgstr "" ++msgstr "Εγκαταστάθηκε από: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" - msgstr "" +-msgstr "" ++msgstr "Τροποποιήθηκε από : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " - msgstr "" +-msgstr "" ++msgstr " Περιγραφή: " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" - msgstr "" +-msgstr "" ++msgstr "ναι" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" - msgstr "" +-msgstr "" ++msgstr "όχι " -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" "Group: %s" - msgstr "" +-msgstr "" ++msgstr "\nΟμάδα: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" - msgstr "" +-msgstr "" ++msgstr " Περιγραφή: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" - msgstr "" +-msgstr "" ++msgstr " Υποχρεωτικά Πακέτα:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" - msgstr "" +-msgstr "" ++msgstr " Προεπιλεγμένα Πακέτα:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" - msgstr "" +-msgstr "" ++msgstr " Προαιρετικά Πακέτα:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" - msgstr "" +-msgstr "" ++msgstr "πακέτο: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" - msgstr "" +-msgstr "" ++msgstr "Όνομα αρχείου : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -25923,387 +26478,391 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" - msgstr "" +-msgstr "" ++msgstr "Μέγεθος" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -870,57 +902,58 @@ msgid "" +@@ -870,57 +903,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" -@@ -928,7 +961,7 @@ msgstr "" +@@ -928,7 +962,7 @@ msgstr "" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -936,484 +969,536 @@ msgid "" +@@ -936,532 +970,590 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" - msgstr "" +-msgstr "" ++msgstr "Σύστημα" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" - msgstr "" +-msgstr "" ++msgstr "Ημερομηνία και ώρα" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" - msgstr "" +-msgstr "" ++msgstr "Χρήστης :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -26312,17 +26871,17 @@ index 8df34e7..82146d6 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -26335,224 +26894,230 @@ index 8df34e7..82146d6 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" - msgstr "" +-msgstr "" ++msgstr "Τελευταία εβδομάδα" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" - msgstr "" +-msgstr "" ++msgstr "Τελευταίες 2 εβδομάδες" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" - msgstr "" +-msgstr "" ++msgstr "Τελευταίοι 3 μήνες" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" - msgstr "" +-msgstr "" ++msgstr "Τελευταίοι 6 μήνες" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" - msgstr "" +-msgstr "" ++msgstr "Τελευταίος χρόνος" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" - msgstr "" +-msgstr "" ++msgstr "Πακέτο: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -26560,7 +27125,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -26568,7 +27133,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -26576,7 +27141,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -26584,43 +27149,50 @@ index 8df34e7..82146d6 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" - msgstr "" +-msgstr "" ++msgstr "Ενημερώθηκε από" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -26646,7 +27218,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -26700,9 +27272,10 @@ index 8df34e7..82146d6 100644 #, python-format msgid "" "\n" -@@ -1421,47 +1506,47 @@ msgid "" + "\n" "%s" - msgstr "" +-msgstr "" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -26757,7 +27330,7 @@ index 8df34e7..82146d6 100644 msgid "Complete!" msgstr "" -@@ -1473,7 +1558,7 @@ msgstr "" +@@ -1473,7 +1565,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -26766,7 +27339,7 @@ index 8df34e7..82146d6 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1490,451 +1575,480 @@ msgid "" +@@ -1490,451 +1582,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -26837,7 +27410,8 @@ index 8df34e7..82146d6 100644 -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 msgid "PACKAGE..." - msgstr "" +-msgstr "" ++msgstr "ΠΑΚΕΤΟ..." -#: ../yumcommands.py:203 +#: ../yumcommands.py:307 @@ -26882,12 +27456,14 @@ index 8df34e7..82146d6 100644 -#: ../yumcommands.py:348 +#: ../yumcommands.py:581 msgid "Installed Packages" - msgstr "" +-msgstr "" ++msgstr "Εγκατεστημένα Πακέτα" -#: ../yumcommands.py:356 +#: ../yumcommands.py:589 msgid "Available Packages" - msgstr "" +-msgstr "" ++msgstr "Διαθέσιμα Πακέτα" -#: ../yumcommands.py:360 +#: ../yumcommands.py:593 @@ -26897,7 +27473,8 @@ index 8df34e7..82146d6 100644 -#: ../yumcommands.py:364 +#: ../yumcommands.py:597 msgid "Updated Packages" - msgstr "" +-msgstr "" ++msgstr "Ενημερωμένα Πακέτα" #. This only happens in verbose mode -#: ../yumcommands.py:372 ../yumcommands.py:379 ../yumcommands.py:667 @@ -26936,14 +27513,14 @@ index 8df34e7..82146d6 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -27063,153 +27640,154 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" - msgstr "" +-msgstr "" ++msgstr "κατάσταση" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -27217,7 +27795,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -27225,148 +27803,149 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" - msgstr "" +-msgstr "" ++msgstr " Ομάδα :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1945,100 +2059,106 @@ msgstr "" +@@ -1945,100 +2066,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -27411,226 +27990,227 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" - msgstr "" +-msgstr "" ++msgstr "Μέλος: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2046,991 +2166,1028 @@ msgstr "" +@@ -2046,991 +2173,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -27638,43 +28218,43 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -27887,7 +28467,7 @@ index 8df34e7..82146d6 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -27898,40 +28478,46 @@ index 8df34e7..82146d6 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -27939,23 +28525,23 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -27969,67 +28555,67 @@ index 8df34e7..82146d6 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -28039,26 +28625,26 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -28068,62 +28654,62 @@ index 8df34e7..82146d6 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -28131,79 +28717,79 @@ index 8df34e7..82146d6 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -28211,118 +28797,118 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -28330,7 +28916,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -28338,118 +28924,118 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -28463,7 +29049,7 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -28475,29 +29061,29 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -28505,29 +29091,29 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -28535,117 +29121,117 @@ index 8df34e7..82146d6 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -28745,10 +29331,15 @@ index 8df34e7..82146d6 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3039,6 +3196,14 @@ msgstr "" +@@ -3039,6 +3204,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -28760,11 +29351,17 @@ index 8df34e7..82146d6 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3067,5 +3245,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/en_GB.po b/po/en_GB.po -index 0f3c750..04c380f 100644 +index 0f3c750..79ca990 100644 --- a/po/en_GB.po +++ b/po/en_GB.po -@@ -2,14 +2,15 @@ +@@ -2,938 +2,958 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -28774,22 +29371,24 @@ index 0f3c750..04c380f 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/yum/team/en_GB/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/yum/team/en_GB/)\n" ++"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/yum/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Updating" @@ -28800,31 +29399,31 @@ index 0f3c750..04c380f 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installing" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsoleted" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Updated" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Erased" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Installed" @@ -28851,7 +29450,7 @@ index 0f3c750..04c380f 100644 msgstr "Erased: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Removing" @@ -28861,175 +29460,177 @@ index 0f3c750..04c380f 100644 msgstr "Cleanup" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Command \"%s\" already defined" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Setting up repositories" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Reading repository metadata in from local files" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Config Error: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Options Error: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installed: %s-%s at %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Built : %s at %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Committed: %s at %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "You need to give some command" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "No such command: %s. Please use %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Disk Requirements:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " At least %dMB more space needed on the %s filesystem.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] " At least %dMB more space needed on the %s filesystem.\n" ++msgstr[0] "" +msgstr[1] " At least %dMB more space needed on the %s filesystem.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,60 +143,60 @@ msgstr "" - "Error Summary\n" - "-------------\n" +-msgstr "" +-"Error Summary\n" +-"-------------\n" ++msgstr "Error Summary\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Trying to run the transaction but nothing to do. Exiting." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Exiting on user Command" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Downloading Packages:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Error Downloading Packages:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Running Transaction Check" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ERROR You need to update rpm to handle:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "ERROR with transaction check vs depsolve:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM needs to be updated" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Please report this error in %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Running Transaction Test" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Transaction Check Error:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Transaction Test Succeeded" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Running Transaction" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -201,234 +204,257 @@ msgstr "" - "Refusing to automatically import keys when running unattended.\n" - "Use \"-y\" to override." +-msgstr "" +-"Refusing to automatically import keys when running unattended.\n" +-"Use \"-y\" to override." ++msgstr "Refusing to automatically import keys when running unattended.\nUse \"-y\" to override." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Maybe you meant: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Package(s) %s%s%s available, but not installed." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "No package %s%s%s available." @@ -29037,7 +29638,7 @@ index 0f3c750..04c380f 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Package(s) to install" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -29046,13 +29647,13 @@ index 0f3c750..04c380f 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nothing to do" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d packages marked for Update" @@ -29062,12 +29663,12 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "No Packages marked for Update" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d packages marked for Distribution Synchronisation" @@ -29077,12 +29678,12 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "No Packages marked for Distribution Synchronisation" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d packages marked for removal" @@ -29092,14 +29693,14 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "No Packages marked for removal" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Package(s) to downgrade" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -29107,13 +29708,13 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (from %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installed package %s%s%s%s not available." @@ -29121,7 +29722,7 @@ index 0f3c750..04c380f 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Package(s) to reinstall" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -29129,152 +29730,153 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "No Packages Provided" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Package(s) to install" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "N/S Matched: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr " Name and summary matches %sonly%s, use \"search all\" for everything." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Full name and summary matches %sonly%s, use \"search all\" for everything." +-msgstr "" +-" Full name and summary matches %sonly%s, use \"search all\" for everything." ++msgstr " Full name and summary matches %sonly%s, use \"search all\" for everything." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Matched: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr " Name and summary matches %smostly%s, use \"search all\" for everything." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Warning: No matches found for: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "No Matches found" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "No Package Found for %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Cleaning repos: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Cleaning up Everything" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Cleaning up Headers" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Cleaning up Packages" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Cleaning up xml metadata" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Cleaning up database cache" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Cleaning up expire-cache metadata" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Cleaning up cached rpmdb data" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Cleaning up plugins" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Warning: No groups match: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Installed Groups:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Installed Language Groups:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Available Groups:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Available Language Groups:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Done" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Warning: Group %s does not exist." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "No packages in any requested group available to install or update" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Package(s) to Install" @@ -29284,18 +29886,18 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "No group named %s exists" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "No packages to remove from groups" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Package(s) to remove" @@ -29305,597 +29907,607 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Package %s is already installed, skipping" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Discarding non-comparable pkg %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "No other %s installed, adding to list for potential install" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Plugin Options" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Command line error: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -439,284 +465,288 @@ msgstr "" "\n" "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s option requires an argument" ++msgstr "\n\n%s: %s option requires an argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color takes one of: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot must be an absolute path: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "show this help message and exit" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "be tolerant of errors" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "run entirely from system cache, don't update cache" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "config file location" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maximum command wait time" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "debugging output level" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "show duplicates, in repos, in list/search commands" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "error output level" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "debugging output level for rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "quiet operation" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "verbose operation" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "answer yes for all questions" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "show Yum version and exit" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "set install root" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "enable one or more repositories (wildcards allowed)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "disable one or more repositories (wildcards allowed)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "exclude package(s) by name or glob" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "disable exclude from main, for a repo or for everything" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "enable obsoletes processing during updates" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "disable Yum plugins" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "disable gpg signature checking" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "disable plugins by name" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "enable plugins by name" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "skip packages with depsolving problems" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "control whether colour is used" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "set value of $releasever in yum config and repo files" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "set arbitrary config and repo options" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "May" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Aug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Oct" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Dec" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Trying other mirror." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Name : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arch : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoch : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Version : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Release : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Size : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repo : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "From repo : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Committer : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Committime : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Buildtime : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Install time: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Installed by: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Changed by : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Summary : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licence : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Description : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "yes" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "no" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Is this ok [y/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -725,154 +755,156 @@ msgstr "" - "\n" "Group: %s" +-msgstr "" +-"\n" +-"Group: %s" ++msgstr "\nGroup: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Group-Id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Description: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Language: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Mandatory Packages:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Default Packages:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Optional Packages:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Conditional Packages:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "package: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " No dependencies for this package" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " dependency: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Unsatisfied dependency" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Matched from:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licence : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Filename : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Other : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "There was an error calculating total download size" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Total size: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Total download size: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Installed size: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "There was an error calculating installed size" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Reinstalling" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Downgrading" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Installing for dependencies" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Updating for dependencies" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Removing for dependencies" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Skipped (dependency problems)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Not installed" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Package" +msgid_plural "Packages" -+msgstr[0] "Package" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Package" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arch" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Version" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repository" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Size" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " replacing %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -883,57 +915,58 @@ msgstr "" "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Transaction Summary\n" +-"%s\n" ++msgstr "\nTransaction Summary\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Install" @@ -29903,7 +30515,7 @@ index 0f3c750..04c380f 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -29911,7 +30523,7 @@ index 0f3c750..04c380f 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -29919,7 +30531,7 @@ index 0f3c750..04c380f 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Reinstall" @@ -29927,322 +30539,326 @@ index 0f3c750..04c380f 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Downgrade" - --#: ../output.py:1165 -+#: ../output.py:1464 ++ ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" -+ -+#: ../output.py:1524 + +-#: ../output.py:1165 ++#: ../output.py:1531 msgid "Removed" msgstr "Removed" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Dependency Removed" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Dependency Installed" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Dependency Updated" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Replaced" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Failed" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "two" -@@ -941,7 +974,7 @@ msgstr "two" +@@ -941,564 +961,598 @@ msgstr "two" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -952,364 +985,416 @@ msgstr "" " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" "to exit.\n" +-msgstr "" +-"\n" +-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" +-"to exit.\n" ++msgstr "\n Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\nto exit.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "user interrupt" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Skipping merged transaction %d to %d, as it overlaps" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "No transactions" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Bad transaction IDs, or package(s), given" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Command line" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Login user" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Date and time" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Action(s)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Altered" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "No transaction ID given" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Bad transaction ID given" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Not found given transaction ID" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Found more than one transaction ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "No transaction ID, or package, given" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Downgraded" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Older" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Newer" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Transaction ID :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Begin time :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Begin rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u seconds)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minutes)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u hours)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u days)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "End time :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "End rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "User :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Return-Code :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Aborted" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Failures:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Failure:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Success" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Command Line :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Additional non-default information stored: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transaction performed with:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Packages Altered:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Packages Skipped:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb Problems:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scriptlet output:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Errors:" @@ -30251,17 +30867,17 @@ index 0f3c750..04c380f 100644 -msgstr "Install" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Dep-Install" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Obsoleting" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Erase" @@ -30274,296 +30890,310 @@ index 0f3c750..04c380f 100644 -msgstr "Downgrade" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Update" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Time" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Last day" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Last week" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Last 2 weeks" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Last 3 months" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Last 6 months" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Last year" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Over a year ago" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "No Transaction %s found" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Transaction ID:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Available additional history information:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: No additional data found by this name" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installed" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "an update" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "erased" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "reinstalled" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "a downgrade" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "obsoleting" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "updated" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "obsoleted" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Package %s.%s %s:%s-%s will be %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Running transaction check" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Restarting Dependency Resolution with new changes." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Finished Dependency Resolution" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Processing Dependency: %s for package: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Keeping package: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Unresolved Dependency: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Package: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1318,7 +1403,7 @@ msgstr "" - "\n" " Requires: %s" +-msgstr "" +-"\n" +-" Requires: %s" ++msgstr "\n Requires: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1327,7 +1412,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1336,7 +1421,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1345,85 +1430,85 @@ msgstr "" - " Not found" +-msgstr "" +-"\n" +-" Not found" ++msgstr "\n Not found" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Updated By" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Downgraded By" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Obsoleted By" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Available" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Processing Conflict: %s conflicts %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Populating transaction set with selected packages. Please wait." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Downloading header for %s to pack into transaction set." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Running" @@ -30589,7 +31219,7 @@ index 0f3c750..04c380f 100644 msgstr "Traced/Stopped" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Unknown" @@ -30627,36 +31257,47 @@ index 0f3c750..04c380f 100644 msgid "" "\n" "\n" -@@ -1433,7 +1518,7 @@ msgstr "" - "\n" "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Exiting on user cancel" ++msgstr "\n\nExiting on user cancel" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1443,7 +1528,7 @@ msgstr "" - "\n" "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Exiting on Broken Pipe" ++msgstr "\n\nExiting on Broken Pipe" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1454,7 +1539,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1462,35 +1547,35 @@ msgstr "" - "Another app is currently holding the yum lock; exiting as configured by " - "exit_on_lock" +-msgstr "" +-"Another app is currently holding the yum lock; exiting as configured by " +-"exit_on_lock" ++msgstr "Another app is currently holding the yum lock; exiting as configured by exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -30697,16 +31338,17 @@ index 0f3c750..04c380f 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1498,7 +1583,7 @@ msgstr "" - "\n" - "Dependencies Resolved" +-msgstr "" +-"\n" +-"Dependencies Resolved" ++msgstr "\nDependencies Resolved" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Complete!" -@@ -1510,7 +1595,7 @@ msgstr " Mini usage:\n" +@@ -1510,7 +1564,7 @@ msgstr " Mini usage:\n" msgid "You need to be root to perform this command." msgstr "You need to be root to perform this command." @@ -30715,9 +31357,25 @@ index 0f3c750..04c380f 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1540,53 +1625,53 @@ msgstr "" +@@ -1525,475 +1579,482 @@ msgid "" + "will install it for you.\n" "\n" "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"You have enabled checking of packages via GPG keys. This is a good thing. \n" +-"However, you do not have any GPG public keys installed. You need to download\n" +-"the keys for packages you wish to install and install them.\n" +-"You can do that by running the command:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Alternatively you can specify the url to the key you would like to use\n" +-"for a repository in the 'gpgkey' option in a repository section and yum \n" +-"will install it for you.\n" +-"\n" +-"For more information contact your distribution or package provider.\n" ++msgstr "\nYou have enabled checking of packages via GPG keys. This is a good thing. \nHowever, you do not have any GPG public keys installed. You need to download\nthe keys for packages you wish to install and install them.\nYou can do that by running the command:\n rpm --import public.gpg.key\n\n\nAlternatively you can specify the url to the key you would like to use\nfor a repository in the 'gpgkey' option in a repository section and yum \nwill install it for you.\n\nFor more information contact your distribution or package provider.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -30780,9 +31438,12 @@ index 0f3c750..04c380f 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1596,306 +1681,295 @@ msgstr "" - " Run \"yum repolist all\" to see the repos you have.\n" " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"There are no enabled repos.\n" +-" Run \"yum repolist all\" to see the repos you have.\n" +-" You can enable repos with yum-config-manager --enable " ++msgstr "There are no enabled repos.\n Run \"yum repolist all\" to see the repos you have.\n You can enable repos with yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -31014,312 +31675,318 @@ index 0f3c750..04c380f 100644 msgstr "Display the configured software repositories" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "enabled" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "disabled" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Repo-revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Repo-size : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Updated : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Never (last: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Instant (last: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s second(s) (last: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-include : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Repo-excluded: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "repo id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "repo name" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Display a helpful usage message" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "No help available for %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1905,7 +1979,7 @@ msgstr "" - "\n" "aliases: " +-msgstr "" +-"\n" +-"\n" +-"aliases: " ++msgstr "\n\naliases: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1915,85 +1989,125 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Setting up Reinstall Process" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "reinstall a package" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Setting up Downgrade Process" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "downgrade a package" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Display a version for the machine and/or available repos." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum version groups:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Group :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Packages:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Installed:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Group-Installed:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Available:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Group-Available:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Display, or use, the transaction history" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Invalid history sub-command, use: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "You don't have access to the history DB." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Check for problems in the rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "load a saved transaction from filename" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "No saved transaction file specified." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "loading transaction from %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transaction loaded from %s with %s members" -@@ -2004,27 +2118,33 @@ msgstr "Transaction loaded from %s with %s members" +@@ -2004,104 +2065,106 @@ msgstr "Transaction loaded from %s with %s members" msgid " Yum checks failed: %s" msgstr " Yum checks failed: %s" @@ -31339,8 +32006,7 @@ index 0f3c750..04c380f 100644 +#: ../yummain.py:128 +msgid "" +"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "" -+"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Another app is currently holding the yum lock; waiting for it to exit..." + #. Depsolve stage -#: ../yummain.py:167 @@ -31353,286 +32019,291 @@ index 0f3c750..04c380f 100644 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" -msgstr "Your transaction was saved, rerun it with: yum load-transaction %s" -+msgid "" +- +-#: ../yummain.py:288 + msgid "" +-"\n" +-"\n" +-"Exiting on user cancel." +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" -+msgstr "" - --#: ../yummain.py:288 + msgstr "" ++ +#: ../yummain.py:326 - msgid "" - "\n" ++msgid "" "\n" -@@ -2034,74 +2154,74 @@ msgstr "" "\n" "Exiting on user cancel." ++msgstr "\n\nExiting on user cancel." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() will go away in a future version of Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Setting up TransactionSets before config class is up" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Invalid tsflag in config file: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Searching pkgSack for dep: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Member: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s converted to install" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Adding Package %s in mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Removing Package %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s requires: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s requires %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Needed Require has already been looked up, cheating" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Needed Require is not a package name. Looking up: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Potential Provider: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Mode is %s for provider of %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Mode for pkg providing %s: %s" -@@ -2109,114 +2229,114 @@ msgstr "Mode for pkg providing %s: %s" +@@ -2109,1025 +2172,1029 @@ msgstr "Mode for pkg providing %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Trying to update %s to resolve dep" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "No update paths found for %s. Failure!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s package requiring %s marked as erase" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Obsoleting %s with %s to resolve dep." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Updating %s to resolve dep." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Cannot find an update path for dep for: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Quick matched %s to require for %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s is in providing packages but it is already installed, removing." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potential resolving package %s has newer instance in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potential resolving package %s has newer instance installed." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s already in ts, skipping this one" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Marking %s as update for %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Marking %s as install for %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Success - empty transaction" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Restarting Loop" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Dependency Process ending" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Success - deps resolved" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Checking deps for %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "looking for %s as a requirement of %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Running compare_providers() for %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "better arch in po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s obsoletes %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2225,142 +2345,142 @@ msgstr "" - "archdist compared %s to %s on %s\n" " Winner: %s" +-msgstr "" +-"archdist compared %s to %s on %s\n" +-" Winner: %s" ++msgstr "archdist compared %s to %s on %s\n Winner: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "common sourcerpm %s and %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "base package %s is installed for %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "common prefix of %s between %s and %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "requires minimal: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Winner: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Loser(with %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Best Order: %s" @@ -31765,9 +32436,10 @@ index 0f3c750..04c380f 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2368,21 +2488,21 @@ msgstr "" - "There are unfinished transactions remaining. You might consider running yum-" - "complete-transaction first to finish them." +-msgstr "" +-"There are unfinished transactions remaining. You might consider running yum-" +-"complete-transaction first to finish them." ++msgstr "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -31791,9 +32463,10 @@ index 0f3c750..04c380f 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2390,88 +2510,91 @@ msgstr "" - "\n" - "Packages skipped because of dependency problems:" +-msgstr "" +-"\n" +-"Packages skipped because of dependency problems:" ++msgstr "\nPackages skipped because of dependency problems:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -31806,8 +32479,9 @@ index 0f3c750..04c380f 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" +-msgstr "" +-"** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" ++msgstr "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -31828,8 +32502,9 @@ index 0f3c750..04c380f 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Warning: scriptlet or other non-fatal errors occurred during transaction." +-msgstr "" +-"Warning: scriptlet or other non-fatal errors occurred during transaction." ++msgstr "Warning: scriptlet or other non-fatal errors occurred during transaction." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -31851,7 +32526,7 @@ index 0f3c750..04c380f 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s was supposed to be installed but is not!" @@ -31862,24 +32537,22 @@ index 0f3c750..04c380f 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s was supposed to be removed but is not!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Could not open lock %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Could not open lock %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Unable to check if PID %s is active" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Unable to check if PID %s is active" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -31889,38 +32562,52 @@ index 0f3c750..04c380f 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Could not create lock at %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Could not open lock %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Unable to check if PID %s is active" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2480,102 +2603,93 @@ msgstr "" - "Package does not match intended download. Suggestion: run yum " "--enablerepo=%s clean metadata" +-msgstr "" +-"Package does not match intended download. Suggestion: run yum " +-"--enablerepo=%s clean metadata" ++msgstr "Package does not match intended download. Suggestion: run yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Could not perform checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Package does not match checksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "package fails checksum but caching is enabled for %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "using local copy of %s" @@ -31937,68 +32624,69 @@ index 0f3c750..04c380f 100644 -" * needed %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Header is not complete." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, 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" +-msgstr "" +-"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:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Public key for %s is not installed" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problem opening package %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Public key for %s is not trusted" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Package %s is not signed" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Cannot remove %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s removed" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Cannot remove %s file %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s file %s removed" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s files removed" @@ -32008,28 +32696,29 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "More than one identical match in sack for %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nothing matches %s.%s %s:%s-%s from update" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2583,121 +2697,124 @@ msgstr "" - "searchPackages() will go away in a future version of Yum." - " Use searchGenerator() instead. \n" +-msgstr "" +-"searchPackages() will go away in a future version of Yum." +-" Use searchGenerator() instead. \n" ++msgstr "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Searching %d packages" @@ -32039,62 +32728,62 @@ index 0f3c750..04c380f 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "searching package %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "searching in file entries" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "searching in provides entries" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "No group data available for configured repositories" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "No Group named %s exists" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "package %s was not marked in group %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Adding package %s from group %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "No package named %s available to be installed" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Warning: Group %s does not have any packages." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "Group %s does have %u conditional packages, which may get installed." @@ -32102,143 +32791,145 @@ index 0f3c750..04c380f 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Package tuple %s could not be found in packagesack" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Package tuple %s could not be found in rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Invalid version flag from: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "No Package found for %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Package Object was not a package object instance" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Nothing specified to install" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Checking for virtual provide or file-provide for %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "No Match for argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Package %s installed and not available" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "No package(s) available to install" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Package: %s - already in transaction set" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Package %s is obsoleted by %s which is already installed" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2706,94 +2823,100 @@ msgstr "" - "Package %s is obsoleted by %s, but obsoleting package does not provide for " "requirements" +-msgstr "" +-"Package %s is obsoleted by %s, but obsoleting package does not provide for " +-"requirements" ++msgstr "Package %s is obsoleted by %s, but obsoleting package does not provide for requirements" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Package %s is obsoleted by %s, trying to install %s instead" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Package %s already installed and latest version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Package matching %s already installed. Checking for update." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Updating Everything" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Package is already obsoleted: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Not Updating Package that is obsoleted: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Not Updating Package that is already updated: %s.%s %s:%s-%s" @@ -32246,186 +32937,191 @@ index 0f3c750..04c380f 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Skipping the running kernel: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Removing %s from the transaction" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Cannot open: %s. Skipping." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Examining %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Cannot localinstall deltarpm: %s. Skipping." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Cannot add package %s to transaction. Not a compatible architecture: %s" +-msgstr "" +-"Cannot add package %s to transaction. Not a compatible architecture: %s" ++msgstr "Cannot add package %s to transaction. Not a compatible architecture: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Cannot install package %s. It is obsoleted by installed package %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2802,7 +2925,7 @@ msgstr "" - "Package %s not installed, cannot update it. Run yum install to install it " "instead." +-msgstr "" +-"Package %s not installed, cannot update it. Run yum install to install it " +-"instead." ++msgstr "Package %s not installed, cannot update it. Run yum install to install it instead." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2811,137 +2934,137 @@ msgstr "" - "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." +-msgstr "" +-"Package %s.%s not installed, cannot update it. Run yum install to install it" +-" instead." ++msgstr "Package %s.%s not installed, cannot update it. Run yum install to install it instead." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Excluding %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Marking %s to be installed" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Marking %s as an update to %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: does not update installed package." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Cannot open file: %s. Skipping." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem in reinstall: no package matched to remove" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem in reinstall: no package %s matched to install" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "No package(s) available to downgrade" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Package %s is allowed multiple installs, skipping" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "No Match for available package: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Only Upgrade available on package: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Failed to downgrade: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Retrieving key from %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG key retrieval failed: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "GPG key signature on key %s does not matvch CA Key for repo: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG key signature verified against CA Key(s)" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Invalid GPG Key from %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG key parsing failed: key does not have value %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -32443,7 +33139,7 @@ index 0f3c750..04c380f 100644 -"From : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -32458,179 +33154,183 @@ index 0f3c750..04c380f 100644 -"From : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG key at %s (0x%s) is already installed" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Key import failed (code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Key imported successfully" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Didn't install any keys" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2950,25 +3073,25 @@ msgstr "" - "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" +-"Check that the correct key URLs are configured for this repository." ++msgstr "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\nCheck that the correct key URLs are configured for this repository." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import of key(s) didn't help, wrong key(s)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG key at %s (0x%s) is already imported" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Key import failed" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Didn't install any keys for repo %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2977,157 +3100,181 @@ msgstr "" - "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" +-"Check that the correct key URLs are configured for this repository." ++msgstr "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\nCheck that the correct key URLs are configured for this repository." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Unable to find a suitable mirror." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Errors were encountered while downloading packages." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Please report this error at %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Test Transaction Errors: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Could not set cachedir: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "Dependencies not solved. Will not save unresolved transaction." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Could not save transaction file %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Could not access/read saved transaction %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "rpmdb ver mismatched saved transaction version, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " ignoring, as requested." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " aborting." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "cannot find tsflags or tsflags not integer." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Found txmbr in unknown current state: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Could not find txmbr: %s in state %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Could not find txmbr: %s from origin: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Transaction members, relations are missing or ts has been modified," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " ignoring, as requested. You must redepsolve!" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -32730,26 +33430,44 @@ index 0f3c750..04c380f 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s provides %s but it cannot be found" -@@ -3136,6 +3283,17 @@ msgstr "%s provides %s but it cannot be found" +@@ -3136,6 +3203,19 @@ msgstr "%s provides %s but it cannot be found" msgid "Repackaging" msgstr "Repackaging" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Insufficient space in download directory %s\n" -+" * free %s\n" -+" * needed %s" ++msgstr "Insufficient space in download directory %s\n * free %s\n * needed %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3148,8 +3228,7 @@ msgstr "RPM %s fails md5 check" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Could not open RPM database for reading. Perhaps it is already in use?" ++msgstr "Could not open RPM database for reading. Perhaps it is already in use?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3165,5 +3244,3 @@ msgstr "Damaged Header %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Error opening rpm %s - error %s" +- +- diff --git a/po/es.po b/po/es.po -index 2b1397d..a4d0a5d 100644 +index 2b1397d..0edf405 100644 --- a/po/es.po +++ b/po/es.po @@ -2,15 +2,18 @@ @@ -32766,22 +33484,23 @@ index 2b1397d..a4d0a5d 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-27 13:11+0000\n" -+"Last-Translator: elsupergomez \n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-13 13:29+0000\n" ++"Last-Translator: Daniel Cabrera \n" "Language-Team: Spanish (Castilian) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -18,122 +21,124 @@ msgstr "" +@@ -18,941 +21,942 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Actualizando" @@ -32792,31 +33511,31 @@ index 2b1397d..a4d0a5d 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalando" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsoleto" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Actualizado" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Eliminado" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Instalado" @@ -32843,7 +33562,7 @@ index 2b1397d..a4d0a5d 100644 msgstr "Eliminado: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Eliminando" @@ -32853,69 +33572,69 @@ index 2b1397d..a4d0a5d 100644 msgstr "Limpieza" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "El comando \"%s\" ya ha sido definido" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Configurando los repositorios" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Leyendo en archivos locales los metadatos de los repositorios" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Error de configuración: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Error de opciones: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instalado: %s-%s en %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Construido: %s en %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Enviado: %s en %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Necesita ingresar algún comando" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "No existe el comando: %s. Por favor, utilice %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Requerimientos de disco:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Como mínimo se necesitan %dMB más en el sistema de archivos %s.\n" @@ -32926,105 +33645,109 @@ index 2b1397d..a4d0a5d 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -141,61 +146,61 @@ msgstr "" - "Resumen de errores\n" - "-------------\n" +-msgstr "" +-"Resumen de errores\n" +-"-------------\n" ++msgstr "Resumen de errores\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." +-msgstr "" +-"Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." ++msgstr "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Saliendo de acuerdo al comando del usuario" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Descargando paquetes:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Error al descargar los paquetes:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Ejecutando verificación de transacción" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ERROR Necesita actualizar el rpm para manipular:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "ERROR en el chequeo de la transacción vs resolución de dependencias:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "El RPM necesita ser actualizado" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Por favor, reporte este error en %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Ejecutando prueba de transacción" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Error en la verificación de la transacción:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "La prueba de transacción ha sido exitosa" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Ejecutando transacción" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -203,94 +208,112 @@ msgstr "" - "Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n" - "Utilice \"-y\" para forzar." +-msgstr "" +-"Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n" +-"Utilice \"-y\" para forzar." ++msgstr "Se rechaza la importación automática de claves cuando se ejecuta desatendida.\nUtilice \"-y\" para forzar." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Tal vez quería decir: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." - msgstr "" - "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) " - "instalado." +-msgstr "" +-"El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) " +-"instalado." ++msgstr "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) instalado." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "No existe disponible ningún paquete %s%s%s." @@ -33032,7 +33755,7 @@ index 2b1397d..a4d0a5d 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paquete(s) a instalarse" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -33041,13 +33764,13 @@ index 2b1397d..a4d0a5d 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nada para hacer" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paquetes han sido seleccionados para ser actualizados" @@ -33057,12 +33780,12 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes marcados para ser actualizados" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "No se han seleccionando paquetes para ser actualizados" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -33073,12 +33796,12 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes marcados para la Sincronización de Distribución" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "No se han seleccionado paquetes para Sincronización de distribución" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paquetes han sido seleccionados para ser eliminados" @@ -33088,14 +33811,14 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes marcados para ser eliminados" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "No se han seleccionado paquetes para ser eliminados" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paquete(s) a desactualizar" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -33103,13 +33826,13 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes a rebajar versión" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (desde %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "El paquete instalado %s%s%s%s no se encuentra disponible." @@ -33117,7 +33840,7 @@ index 2b1397d..a4d0a5d 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paquete(s) a reinstalar" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -33125,160 +33848,164 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes a reinstalar" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "No se ha ofrecido ningún paquete" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paquete(s) a instalarse" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "Nombre/Resumen que coinciden con: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Nombre y resumen que coinciden con %s y sólo %s, use \"buscar todo\" para " - "todo." +-msgstr "" +-" Nombre y resumen que coinciden con %s y sólo %s, use \"buscar todo\" para " +-"todo." ++msgstr " Nombre y resumen que coinciden con %s y sólo %s, use \"buscar todo\" para todo." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -298,150 +321,154 @@ msgstr "" - " Nombre completo y resumen que coinciden con %s y sólo %s, use \"buscar " - "todo\" para todo." +-msgstr "" +-" Nombre completo y resumen que coinciden con %s y sólo %s, use \"buscar " +-"todo\" para todo." ++msgstr " Nombre completo y resumen que coinciden con %s y sólo %s, use \"buscar todo\" para todo." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Concordante: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " Nombre y resumen que coinciden con %s y en general con %s, use \"buscar " - "todo\" para todo." +-msgstr "" +-" Nombre y resumen que coinciden con %s y en general con %s, use \"buscar " +-"todo\" para todo." ++msgstr " Nombre y resumen que coinciden con %s y en general con %s, use \"buscar todo\" para todo." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Aviso: No se ha encontrado ningún resultado para: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "No se ha encontrado ningún resultado" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "No se ha encontrado ningún paquete para %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " -msgstr "Limpiando repositorios:" +msgstr "Limpiando repositorios: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Limpiando todo" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Limpiando encabezados" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Limpiando paquetes" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Limpiando metadatos xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Limpiando el caché de la base de datos" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Limpiando metadatos expirados del caché" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Limpiando datos de rpmdb en el caché" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Limpiando complementos" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Advertencia: No hay grupos coincidentes con: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Grupos instalados:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Grupos de idioma instalados:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Grupos disponibles:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Grupos de idioma disponibles:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Listo" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Aviso: el grupo %s no existe." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "En los grupos solicitados no existe disponible ningún paquete para ser " - "instalado o actualizado" +-msgstr "" +-"En los grupos solicitados no existe disponible ningún paquete para ser " +-"instalado o actualizado" ++msgstr "En los grupos solicitados no existe disponible ningún paquete para ser instalado o actualizado" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paquete(s) a instalar" @@ -33288,18 +34015,18 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes a instalar" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "No existe ningún grupo denominado %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "No existen paquetes a eliminarse de los grupos" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paquete(s) a eliminar" @@ -33309,607 +34036,621 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d paquetes a eliminar" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Ya se encuentra instalado el paquete %s, ignorando" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Descartando paquete no comparable %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "No existe instalado otro %s, agregando a la lista para instalación posible" +-msgstr "" +-"No existe instalado otro %s, agregando a la lista para instalación posible" ++msgstr "No existe instalado otro %s, agregando a la lista para instalación posible" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opciones de complementos" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Error en la línea de comando: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -452,290 +479,294 @@ msgstr "" "\n" - "%s: la opción %s necesita un argumento" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: la opción %s necesita un argumento" ++msgstr "\n\n%s: la opción %s necesita un argumento" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color acepta una de las siguientes opciones: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--insallroot debe ser una ruta absoluta: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "muestra este mensaje de ayuda y cierra" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "sea tolerante con los errores" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "configurar ubicación de archivo" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "tiempo máximo de espera del comando" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "nivel de depuración de la salida" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" - msgstr "" - "muestra duplicados en los repositorios, y en los comandos para " - "mostrar/buscar" +-msgstr "" +-"muestra duplicados en los repositorios, y en los comandos para " +-"mostrar/buscar" ++msgstr "muestra duplicados en los repositorios, y en los comandos para mostrar/buscar" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "nivel de error de la salida" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "nivel de depuración de salida para rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "operación discreta" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "operación detallada" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" -msgstr "responde \"si\" a todas las preguntas" +msgstr "responde \"sí\" a todas las preguntas" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "responder no para todas las preguntas" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "muestra la versión de Yum y finaliza" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "define la raíz de instalación" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "activa uno o más repositorios (los comodines son permitidos)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "desactiva uno o más repositorios (los comodines son permitidos)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "excluya paquete(s) de acuerdo a su nombre o glob " -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" - msgstr "" - "deshabilita la posibilidad de exclusión desde main, para un repositorio o " - "para todos" +-msgstr "" +-"deshabilita la posibilidad de exclusión desde main, para un repositorio o " +-"para todos" ++msgstr "deshabilita la posibilidad de exclusión desde main, para un repositorio o para todos" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "deshabilita los complementos de Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "deshabilita la verificación de firmas GPG" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "deshabilita complementos de acuerdo a su nombre" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "habilita complementos de acuerdo a su nombre" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "ignora paquetes con problemas de resolución de dependencias" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "controla la utilización de colores" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "define el valor de $releasever en los aarchivos de configuración de yum y de" - " los repositorios" +-msgstr "" +-"define el valor de $releasever en los aarchivos de configuración de yum y de" +-" los repositorios" ++msgstr "define el valor de $releasever en los aarchivos de configuración de yum y de los repositorios" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "define una configuración arbitraria y opciones de los repositorios" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Ene" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Abr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "May" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Ago" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Oct" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Dic" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Intentando con otro espejo." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Nombre : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arquitectura : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Período : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Versión : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Lanzamiento : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Tamaño : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repositorio : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Desde el repositorio : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Enviado por : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Horario del envío : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Horario de la construcción : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Horario de la instalación: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Instalado por: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Modificado por : %s " -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Resumen : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licencia : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Descripción :" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "s" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" -msgstr "si" +msgstr "sí" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "no" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Está de acuerdo [s/N]:" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -744,154 +775,156 @@ msgstr "" - "\n" - "Grupo: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grupo: %s" ++msgstr "\nGrupo: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Group-Id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Descripción: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Idioma: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Paquetes obligatorios:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Paquetes predeterminados:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Paquetes opcionales:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Paquetes condicionales:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paquete: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " No existen dependencias para este paquete" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " dependencia: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Dependencia no satisfecha" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Resultado obtenido desde:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licencia : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Nombre del archivo : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Otro : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Hubo un error mientras se calculaba el tamaño total de la descarga" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Tamaño total: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Tamaño total de la descarga: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Tamaño instalado: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Hubo un error mientras se calculaba el tamaño instalado" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Reinstalando" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Desactualizando" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Instalando para las dependencias" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Actualizando para las dependencias" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Eliminando para las dependencias" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Ignorando (problemas de dependencias)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "No instalado" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "No disponible" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paquete" +msgid_plural "Packages" +msgstr[0] "Paquete" -+msgstr[1] "" ++msgstr[1] "Paquetes" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arquitectura" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versión" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repositorio" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Tamaño" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " reemplazando %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -902,57 +935,58 @@ msgstr "" - "Resumen de la transacción\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Resumen de la transacción\n" +-"%s\n" ++msgstr "\nResumen de la transacción\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalar %5.5s Paquete(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Instalar" @@ -33917,7 +34658,7 @@ index 2b1397d..a4d0a5d 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Actualizar %5.5s Paquete(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Actualizar" @@ -33925,7 +34666,7 @@ index 2b1397d..a4d0a5d 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Eliminar %5.5s Paquete(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Eliminar" @@ -33933,7 +34674,7 @@ index 2b1397d..a4d0a5d 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalar %5.5s Paquete(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Reinstalar" @@ -33941,326 +34682,326 @@ index 2b1397d..a4d0a5d 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Desactualizar %5.5s Paquete(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Desactualizar" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Paquete dependiente" +msgstr[1] "Paquetes dependientes" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Eliminado(s)" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Dependencia(s) eliminada(s)" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Dependencia(s) instalada(s)" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Dependencia(s) actualizada(s)" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Sustituido(s)" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Falló" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "dos" -@@ -960,7 +994,7 @@ msgstr "dos" +@@ -960,571 +964,598 @@ msgstr "dos" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -968,369 +1002,421 @@ msgid "" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" "to exit.\n" - msgstr "" - "\n" +-msgstr "" +-"\n" -" Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\n" -+"Se ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\n" - "para finalizar.\n" +-"para finalizar.\n" ++msgstr "\nSe ha cancelado la descarga actual, %sinterrumpa con (ctrl-c) nuevamente%s dentro de %s%s%s segundos\npara finalizar.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "interrupción solicitada por el usuario" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Omitiendo transacción mezclada %d a %d, dado que se superponen" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Sin transacciones" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Linea de comandos" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Registro de usuario" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Día y hora" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Acción(es)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Modificado" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "No se ha indicado un ID de transacción" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Se ha indicado un ID de transacción no válido " -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "No se ha encontrado el ID de transacción indicado" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "¡Se ha encontrado más de un ID de transacción!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "No se ha indicado ningún paquete, o ID de transacción" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Desactualizado" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Antiguos" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Nuevos" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "ID de transacción :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Hora inicial :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Rpmdb inicial :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u segundos)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minutos)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u horas)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u dias)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Hora final : " -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Rpmdb final :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Usuario :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Codigo-obtenido :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Abortado" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Fallas:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Falla:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Exito" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Línea de comando :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Información adicional no predeterminada almacenada: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transacción realizada con:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Paquetes modificados:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Paquetes ignorados:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problemas en la base de datos RPM: " -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Información del scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Errores:" @@ -34269,17 +35010,17 @@ index 2b1397d..a4d0a5d 100644 -msgstr "Instalar" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Instalación de dependencias" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Convirtiendo en obsoleto" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Eliminar" @@ -34292,300 +35033,317 @@ index 2b1397d..a4d0a5d 100644 -msgstr "Desactualizar" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Actualizar" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Hora" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Ultimo día" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Ultima semana" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Ultimas 2 semanas" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Ultimos 3 meses" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Ultimos 6 meses" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Ultimo año" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Hace más de un año" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "No se ha encontrado una transacción %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "ID de transacción :" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Información de historial adicional disponible:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s No ha sido encontrada información adicional con este nombre" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Paquete :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "Estado :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Tamaño :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Equipo de construcción:" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Fecha de construcción:" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Empaquetador :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Vendedor :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Licencia :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "RPM Fuente :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Fecha de publicación:" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Publicador :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Razón :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Repositorio :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Instalado por :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Modificado por :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "instalado" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "una actualización" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "eliminado" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "reinstalado" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "una desactualización" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "obsoleto" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "actualizado" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "obsoleto" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paquete %s.%s %s:%s-%s debe ser %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Ejecutando prueba de transacción" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Reiniciando la resolución de las dependencias con las nuevas " - "modificaciones." +-msgstr "" +-"--> Reiniciando la resolución de las dependencias con las nuevas " +-"modificaciones." ++msgstr "--> Reiniciando la resolución de las dependencias con las nuevas modificaciones." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Resolución de dependencias finalizada" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Procesando dependencias: %s para el paquete: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Manteniendo el paquete: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dependencia no resuelta: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paquete: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1339,7 +1425,7 @@ msgstr "" - "\n" - " Necesita: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Necesita: %s" ++msgstr "\n Necesita: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1348,7 +1434,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1357,7 +1443,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1366,89 +1452,89 @@ msgstr "" - " No encontrado" +-msgstr "" +-"\n" +-" No encontrado" ++msgstr "\n No encontrado" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Actualizado por" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Desactualizado por" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Obsoleto por" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Disponible" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Procesando conflictos: %s choca con %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Construyendo el conjunto de las transacciones con los paquetes " - "seleccionados. Por favor aguarde." +-msgstr "" +-"--> Construyendo el conjunto de las transacciones con los paquetes " +-"seleccionados. Por favor aguarde." ++msgstr "--> Construyendo el conjunto de las transacciones con los paquetes seleccionados. Por favor aguarde." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - "---> Descargando el encabezado de %s para incluirlo en el conjunto de " - "transacciones." +-msgstr "" +-"---> Descargando el encabezado de %s para incluirlo en el conjunto de " +-"transacciones." ++msgstr "---> Descargando el encabezado de %s para incluirlo en el conjunto de transacciones." ++ ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Comprobando" -#: ../utils.py:99 +#: ../utils.py:129 @@ -34613,7 +35371,7 @@ index 2b1397d..a4d0a5d 100644 msgstr "Rastreado/Detenido" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Desconocido" @@ -34651,36 +35409,47 @@ index 2b1397d..a4d0a5d 100644 msgid "" "\n" "\n" -@@ -1458,7 +1544,7 @@ msgstr "" - "\n" - "Saliendo por cancelación del usuario" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Saliendo por cancelación del usuario" ++msgstr "\n\nSaliendo por cancelación del usuario" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1468,7 +1554,7 @@ msgstr "" - "\n" - "Saliendo por tubería rota" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Saliendo por tubería rota" ++msgstr "\n\nSaliendo por tubería rota" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1479,7 +1565,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1487,36 +1573,36 @@ msgstr "" - "Otra aplicación tiene retenido el bloqueo de Yum; finalizando de acuerdo a " - "la configuración de exit_on_lock" +-msgstr "" +-"Otra aplicación tiene retenido el bloqueo de Yum; finalizando de acuerdo a " +-"la configuración de exit_on_lock" ++msgstr "Otra aplicación tiene retenido el bloqueo de Yum; finalizando de acuerdo a la configuración de exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -34703,8 +35472,9 @@ index 2b1397d..a4d0a5d 100644 -#: ../utils.py:346 ../yummain.py:194 +#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" - msgstr "" - " Podría intentar utilizar el comando --skip-broken para sortear el problema" +-msgstr "" +-" Podría intentar utilizar el comando --skip-broken para sortear el problema" ++msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema" -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 @@ -34722,16 +35492,17 @@ index 2b1397d..a4d0a5d 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1524,7 +1610,7 @@ msgstr "" - "\n" - "Dependencias resueltas" +-msgstr "" +-"\n" +-"Dependencias resueltas" ++msgstr "\nDependencias resueltas" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "¡Listo!" -@@ -1536,7 +1622,7 @@ msgstr " Minu uso:\n" +@@ -1536,7 +1567,7 @@ msgstr " Minu uso:\n" msgid "You need to be root to perform this command." msgstr "Necesita ser usuario root para poder ejecutar este comando." @@ -34740,9 +35511,25 @@ index 2b1397d..a4d0a5d 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1566,53 +1652,53 @@ msgstr "" +@@ -1551,477 +1582,482 @@ msgid "" + "will install it for you.\n" "\n" - "Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso es bueno. \n" +-"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita descargar\n" +-"e instalar las llaves de todos los paquetes que desee instalar.\n" +-"Esto puede hacerlo si ejecuta el comando:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"También puede indicar la url de la llave del repositorio que desee utilizar\n" +-"en la opción 'gpgkey' en la sección del repositorio, y yum \n" +-"la instalará por usted.\n" +-"\n" +-"Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" ++msgstr "\nUsted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso es bueno. \nSin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita descargar\ne instalar las llaves de todos los paquetes que desee instalar.\nEsto puede hacerlo si ejecuta el comando:\n rpm --import public.gpg.key\n\n\nTambién puede indicar la url de la llave del repositorio que desee utilizar\nen la opción 'gpgkey' en la sección del repositorio, y yum \nla instalará por usted.\n\nPara obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -34806,9 +35593,12 @@ index 2b1397d..a4d0a5d 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1622,308 +1708,297 @@ msgstr "" - " Ejecute \"yum repolist all\" para conocer los repositorios existentes.\n" - " Puede habilitarlos con yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"No existen repositorios habilitados.\n" +-" Ejecute \"yum repolist all\" para conocer los repositorios existentes.\n" +-" Puede habilitarlos con yum-config-manager --enable " ++msgstr "No existen repositorios habilitados.\n Ejecute \"yum repolist all\" para conocer los repositorios existentes.\n Puede habilitarlos con yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -34843,8 +35633,9 @@ index 2b1397d..a4d0a5d 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "Sincroniza los paquetes instalados a las últimas versiones disponibles" +-msgstr "" +-"Sincroniza los paquetes instalados a las últimas versiones disponibles" ++msgstr "Sincroniza los paquetes instalados a las últimas versiones disponibles" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -34954,8 +35745,9 @@ index 2b1397d..a4d0a5d 100644 -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" +-msgstr "" +-"Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" ++msgstr "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo" -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -35042,120 +35834,120 @@ index 2b1397d..a4d0a5d 100644 msgstr "Muestra los repositorios de software configurados" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "habilitado" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "deshabilitado" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Repo-revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Repo-size : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Actualizados : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Nunca (último: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Instante (último: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segundo(s) (último: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-include : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Repositorio excluído:" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Nombre de archivo del repositorio: " @@ -35163,203 +35955,209 @@ index 2b1397d..a4d0a5d 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "id del repositorio" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "estado" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "nombre del repositorio" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Muestra un mensaje de ayuda del uso" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "No existe asistencia disponible para %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1933,7 +2008,7 @@ msgstr "" - "\n" - "apodos: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"apodos: " ++msgstr "\n\napodos: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1943,85 +2018,125 @@ msgstr "" - "\n" - "apodo: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"apodo: " ++msgstr "\n\napodo: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Configurando el proceso de reinstalación" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "reinstalar un paquete" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Configurando el proceso de desactualización" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "desactualizar un paquete a una versión anterior" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Muestra una versión para la máquina y/o los repositorios disponibles." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Grupos de la versión de Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Grupo :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Paquetes:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Instalado:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Grupo-Instalado:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Disponible:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Grupo-Disponible:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Mostrar, o utilizar, el historial de la transacción" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Transacciones:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Hora de inicio :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Hora de fin :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Conteo :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Sub-comando de historia no válido, utilice: %s" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "No posee acceso a la base de datos del historial." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Verifica si hay problemas en la base de datos (rpmdb)" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "carga una transacción guardada desde un archivo" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "No se especificó un archivo de transacción guardada." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "cargando transacción desde %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transacción cargada desde %s con %s miembros." -@@ -2032,29 +2147,36 @@ msgstr "Transacción cargada desde %s con %s miembros." +@@ -2032,108 +2068,106 @@ msgstr "Transacción cargada desde %s con %s miembros." msgid " Yum checks failed: %s" msgstr " Yum falló verificando: %s" -#: ../yummain.py:114 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "" +-"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" - msgstr "" --"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " -+"Sin permiso de lectura/ejecución en el directorio actual, moviendo a /" ++msgstr "Sin permiso de lectura/ejecución en el directorio actual, moviendo a /" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -35369,8 +36167,7 @@ index 2b1397d..a4d0a5d 100644 +#: ../yummain.py:128 +msgid "" +"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "" -+"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " ++msgstr "Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... " + #. Depsolve stage -#: ../yummain.py:167 @@ -35382,299 +36179,308 @@ index 2b1397d..a4d0a5d 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" -+msgid "" -+"Your transaction was saved, rerun it with:\n" -+" yum load-transaction %s" - msgstr "" +-msgstr "" -"Su transacción fue guardada, ejecutela nuevamente con yum load-transaction " -"%s" -+"Su transacción fue guardada, vuelva a ejecutarla con:\n" ++msgid "" ++"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" ++msgstr "Su transacción fue guardada, vuelva a ejecutarla con:\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2064,76 +2186,76 @@ msgstr "" - "\n" - "Saliendo por cancelación del usuario." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Saliendo por cancelación del usuario." ++msgstr "\n\nSaliendo por cancelación del usuario." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" - msgstr "" - "Configurando TransactionSets antes de la activación de clase de " - "configuración" +-msgstr "" +-"Configurando TransactionSets antes de la activación de clase de " +-"configuración" ++msgstr "Configurando TransactionSets antes de la activación de clase de configuración" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag no válido en el archivo de configuración: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Buscando pkgSack para la dependencia: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Miembro: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s convertido para instalar" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Agregando paquete %s en modo %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Eliminando paquete %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s necesita: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s necesita %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "El requerimiento necesitado no es un nombre de paquete. Buscando: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Proveedor posible: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "El modo es %s para el proveedor de %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modo para el paquete que ofrece %s: %s" -@@ -2141,121 +2263,121 @@ msgstr "Modo para el paquete que ofrece %s: %s" +@@ -2141,1067 +2175,1029 @@ msgstr "Modo para el paquete que ofrece %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Intentando actualizar %s para resolver dependencia" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "No se encontraron rutas de actualización para %s. ¡Fallo!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: el paquete %s que necesita %s ha sido marcado para eliminarse" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la " - "dependencia." +-msgstr "" +-"TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la " +-"dependencia." ++msgstr "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la dependencia." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Actualizando %s para resolver la dependencia." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" - msgstr "" - "No es posible encontrar un camino de actualización para la dependencia para:" - " %s" +-msgstr "" +-"No es posible encontrar un camino de actualización para la dependencia para:" +-" %s" ++msgstr "No es posible encontrar un camino de actualización para la dependencia para: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Rápidamente se ha localizado %s al ser requerido por %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s se encuentra entre los paquetes provistos, pero ya está instalado, " - "eliminando. " +-msgstr "" +-"%s se encuentra entre los paquetes provistos, pero ya está instalado, " +-"eliminando. " ++msgstr "%s se encuentra entre los paquetes provistos, pero ya está instalado, eliminando. " -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "El paquete de solución posible %s posee una nueva instancia en ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "El paquete de solución posible %s posee una nueva instancia ya instalada." +-msgstr "" +-"El paquete de solución posible %s posee una nueva instancia ya instalada." ++msgstr "El paquete de solución posible %s posee una nueva instancia ya instalada." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s ya se encuentra en ts, ignorándolo" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Seleccionado %s como actualización de %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Seleccionando %s como una instalación para %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Exito - transacción vacía" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Reiniciando el bucle" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Finalizando el proceso de dependencias" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Exito - dependencias resueltas" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Verificando dependencias para %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "localizando a %s como un requerimiento de %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Ejecutando compare_providers() para %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "mejor arquitectura en po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s hace obsoleto a %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2264,145 +2386,145 @@ msgstr "" - "archdist comparó %s con %s en %s\n" - " Vencedor: %s" + " Winner: %s" +-msgstr "" +-"archdist comparó %s con %s en %s\n" +-" Vencedor: %s" ++msgstr "archdist comparó %s con %s en %s\n Vencedor: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "sourcerpm común %s y %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "el paquete principal %s está instalado para %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefijo común de %s entre %s y %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "requires el mínimo: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Ganador: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Perdedor(con %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Mejor orden: %s" @@ -35694,8 +36500,9 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/__init__.py:533 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "Al repositorio %r le falta un nombre en su configuración, utilizando el id" +-msgstr "" +-"Al repositorio %r le falta un nombre en su configuración, utilizando el id" ++msgstr "Al repositorio %r le falta un nombre en su configuración, utilizando el id" -#: ../yum/__init__.py:526 +#: ../yum/__init__.py:571 @@ -35731,9 +36538,10 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/__init__.py:767 #, python-format msgid "repo object for repo %s lacks a _resetSack method\n" - msgstr "" - "el objeto del repositorio para el repositorio %s necesita de un método a " - "_resetSack\n" +-msgstr "" +-"el objeto del repositorio para el repositorio %s necesita de un método a " +-"_resetSack\n" ++msgstr "el objeto del repositorio para el repositorio %s necesita de un método a _resetSack\n" -#: ../yum/__init__.py:706 +#: ../yum/__init__.py:768 @@ -35810,9 +36618,10 @@ index 2b1397d..a4d0a5d 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2410,21 +2532,21 @@ msgstr "" - "Existen transacciones restantes no finalizadas. Podría considerar primero " - "ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." +-msgstr "" +-"Existen transacciones restantes no finalizadas. Podría considerar primero " +-"ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." ++msgstr "Existen transacciones restantes no finalizadas. Podría considerar primero ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -35836,9 +36645,10 @@ index 2b1397d..a4d0a5d 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2432,93 +2554,96 @@ msgstr "" - "\n" - "Paquetes ignorados por problemas de dependencias:" +-msgstr "" +-"\n" +-"Paquetes ignorados por problemas de dependencias:" ++msgstr "\nPaquetes ignorados por problemas de dependencias:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -35851,16 +36661,18 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Se ha encontrado %d problema(s) pre existentes en la base de datos RPM, " - "este es el resultado de 'yum check':" +-msgstr "" +-"** Se ha encontrado %d problema(s) pre existentes en la base de datos RPM, " +-"este es el resultado de 'yum check':" ++msgstr "** Se ha encontrado %d problema(s) pre existentes en la base de datos RPM, este es el resultado de 'yum check':" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 msgid "Warning: RPMDB altered outside of yum." - msgstr "" - "Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento" - " ajeno a yum." +-msgstr "" +-"Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento" +-" ajeno a yum." ++msgstr "Advertencia: Las bases de datos (RPMDB) han sido modificadas por un elemento ajeno a yum." -#: ../yum/__init__.py:1407 +#: ../yum/__init__.py:1493 @@ -35876,9 +36688,10 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la " - "transacción." +-msgstr "" +-"Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la " +-"transacción." ++msgstr "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la transacción." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -35900,7 +36713,7 @@ index 2b1397d..a4d0a5d 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "¡se suponía que %s estuviera instalado, pero no lo está! " @@ -35911,68 +36724,81 @@ index 2b1397d..a4d0a5d 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "¡se suponía que %s estuviera eliminado, pero no lo está! " -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" - msgstr "No se pudo abrir el bloqueo %s: %s" +-msgid "Could not open lock %s: %s" +-msgstr "No se pudo abrir el bloqueo %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." ++msgstr "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" - msgstr "No es posible verificar si se encuentra activo el PID %s" +-msgid "Unable to check if PID %s is active" +-msgstr "No es posible verificar si se encuentra activo el PID %s" ++msgid "Could not create lock at %s: %s " ++msgstr "No se ha podido crear el bloqueo en %s: %s" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "" - "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." +-msgstr "" +-"Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s." ++msgid "Could not open lock %s: %s" ++msgstr "No se pudo abrir el bloqueo %s: %s" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " - msgstr "No se ha podido crear el bloqueo en %s: %s" +-msgid "Could not create lock at %s: %s " +-msgstr "No se ha podido crear el bloqueo en %s: %s" ++msgid "Unable to check if PID %s is active" ++msgstr "No es posible verificar si se encuentra activo el PID %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2527,42 +2652,31 @@ msgstr "" - "El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar " - "el siguiente comando: yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar " +-"el siguiente comando: yum --enablerepo=%s clean metadata" ++msgstr "El paquete no se corresponde con la descarga pretendida. Sugerimos ejecutar el siguiente comando: yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "No se pudo realizar una suma de verificación" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "El paquete no se corresponde con la suma de verificación" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "el paquete no ha superado la suma de verificación, pero el caché se " - "encuentra habilitado para %s" +-msgstr "" +-"el paquete no ha superado la suma de verificación, pero el caché se " +-"encuentra habilitado para %s" ++msgstr "el paquete no ha superado la suma de verificación, pero el caché se encuentra habilitado para %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "utilizando una copia local de %s" @@ -35989,69 +36815,70 @@ index 2b1397d..a4d0a5d 100644 -" * necesario %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "El encabezado no está completo." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2570,62 +2684,64 @@ msgstr "" - "El encabezado no se encuentra en el caché local, y está habilitado el modo " - "de solo cacheo. No es posible descargar %s" +-msgstr "" +-"El encabezado no se encuentra en el caché local, y está habilitado el modo " +-"de solo cacheo. No es posible descargar %s" ++msgstr "El encabezado no se encuentra en el caché local, y está habilitado el modo de solo cacheo. No es posible descargar %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "No se ha instalado la llave pública de %s " -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problemas abriendo el paquete %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "La llave pública de %s no es confiable" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "El paquete %s no está firmado" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "No es posible eliminar %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s eliminado" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "No es posible eliminar %s archivo %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s archivo %s eliminado" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s archivos eliminados" @@ -36061,28 +36888,29 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "%d %s archivos eliminados" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Más de una correspondencia exacta en el saco para %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nada se corresponde con %s.%s %s:%s-%s desde la actualización" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2633,122 +2749,125 @@ msgstr "" - "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar " - "utilice searchGenerator(). \n" +-msgstr "" +-"searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar " +-"utilice searchGenerator(). \n" ++msgstr "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar utilice searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Buscando %d paquetes" @@ -36092,63 +36920,64 @@ index 2b1397d..a4d0a5d 100644 +msgstr[1] "Buscando paquetes %d" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "buscando paquete %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "buscando en las entradas de archivo" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "buscando en las entradas \"provee\"" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" - msgstr "" - "No existen datos de grupo disponibles en los repositorios configurados" +-msgstr "" +-"No existen datos de grupo disponibles en los repositorios configurados" ++msgstr "No existen datos de grupo disponibles en los repositorios configurados" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "No existe un grupo denominado %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "el paquete %s no fue marcado en el grupo %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Agregando paquete %s del grupo %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "No existe un paquete denominado %s disponible para ser instalado" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Advertencia: Grupo %s no tiene ningun paquete." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "El grupo %s tiene %u paquetes condicionales, que pueden instalarse." @@ -36156,563 +36985,578 @@ index 2b1397d..a4d0a5d 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "La tupla %s de paquetes no pudo ser encontrada en el saco de paquetes" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "La tupla %s de paquetes no pudo ser encontrada en la base de datos" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Bandera de versión inválida en: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "No se ha encontrado ningún paquete para %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "El objeto de paquete no era una instancia de objeto de paquete" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "No se ha indicado nada para instalar" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Verificando la provision virtual o provision de archivo de %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "No hay nada concordante con el argumento: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "El paquete %s está instalado y no se encuentra disponible" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "No existe(n) paquete(s) disponible(s) para instalar" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paquete: %s - ya se encuentra en un conjunto de transacción" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "El paquete %s se hace obsoleto con %s, que ya se encuentra instalado" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2757,19 +2876,19 @@ msgstr "" - "El paquete %s se hace obsoleto con %s, pero el paquete que lo hace obsoleto " - "no ofrece requerimientos" + "requirements" +-msgstr "" +-"El paquete %s se hace obsoleto con %s, pero el paquete que lo hace obsoleto " +-"no ofrece requerimientos" ++msgstr "El paquete %s se hace obsoleto con %s, pero el paquete que lo hace obsoleto no ofrece requerimientos" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "El paquete %s se hace obsoleto con %s, en su lugar se está intentando " - "instalar %s" +-msgstr "" +-"El paquete %s se hace obsoleto con %s, en su lugar se está intentando " +-"instalar %s" ++msgstr "El paquete %s se hace obsoleto con %s, en su lugar se está intentando instalar %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "El paquete %s ya se encuentra instalado con su versión más reciente" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" -@@ -2777,69 +2896,75 @@ msgstr "" - "puede actualizarse." +-msgstr "" +-"El paquete concordante con %s ya se encuentra instalado. Verificando si " +-"puede actualizarse." ++msgstr "El paquete concordante con %s ya se encuentra instalado. Verificando si puede actualizarse." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Actualizando todo" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Ningún paquete encontrado para actualizar: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "El paquete ya es obsoleto: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s " - "%s:%s-%s" +-msgstr "" +-"Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s " +-"%s:%s-%s" ++msgstr "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "No hay paquete correspondiente para ser eliminado" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Ningún paquete encontrado para eliminar: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Salteando el kernel en ejecución: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Eliminando %s de la transacción" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "No es posible abrir: %s. Ignorando." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Examinando %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." - msgstr "" - "No es posible realizar una instalación local de deltarpm: %s. Ignorando." +-msgstr "" +-"No es posible realizar una instalación local de deltarpm: %s. Ignorando." ++msgstr "No es posible realizar una instalación local de deltarpm: %s. Ignorando." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2847,14 +2972,14 @@ msgstr "" - "No es posible añadir el paquete %s a la transacción. La arquitectura no es " - "compatible: %s" +-msgstr "" +-"No es posible añadir el paquete %s a la transacción. La arquitectura no es " +-"compatible: %s" ++msgstr "No es posible añadir el paquete %s a la transacción. La arquitectura no es compatible: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "No es posible instalar el paquete %s. Se encuentra obsoleto debido al " - "paquete instalado %s" +-msgstr "" +-"No es posible instalar el paquete %s. Se encuentra obsoleto debido al " +-"paquete instalado %s" ++msgstr "No es posible instalar el paquete %s. Se encuentra obsoleto debido al paquete instalado %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2863,7 +2988,7 @@ msgstr "" - "El paquete %s no está instalado, no puede actualizarse. En su lugar, para " - "instalarlo, ejecute el comando yum install." + "instead." +-msgstr "" +-"El paquete %s no está instalado, no puede actualizarse. En su lugar, para " +-"instalarlo, ejecute el comando yum install." ++msgstr "El paquete %s no está instalado, no puede actualizarse. En su lugar, para instalarlo, ejecute el comando yum install." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2872,142 +2997,151 @@ msgstr "" - "Paquete %s. %s no instalado, no se puede actualizar. En su lugar, ejecute " - "yum install para instalarlo" + " instead." +-msgstr "" +-"Paquete %s. %s no instalado, no se puede actualizar. En su lugar, ejecute " +-"yum install para instalarlo" ++msgstr "Paquete %s. %s no instalado, no se puede actualizar. En su lugar, ejecute yum install para instalarlo" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Excluyendo %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Marcando %s para ser instalado" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Marcando %s como una actualización de %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: no actualiza el paquete instalado." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "No es posible abrir el archivo: %s. Ignorando." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Problema al reinstalar: no existe ningún paquete concordante para eliminar" +-msgstr "" +-"Problema al reinstalar: no existe ningún paquete concordante para eliminar" ++msgstr "Problema al reinstalar: no existe ningún paquete concordante para eliminar" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Problema al reinstalar: no existe ningún paquete concordante con %s para " - "instalar" +-msgstr "" +-"Problema al reinstalar: no existe ningún paquete concordante con %s para " +-"instalar" ++msgstr "Problema al reinstalar: no existe ningún paquete concordante con %s para instalar" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "No existe(n) paquete(s) disponible(s) para desactualizar" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "El paquete %s permite múltiples instalaciones, ignorando" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Ninguna correspondencia disponible para el paquete: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Solo existe la posibilidad de actualizar el paquete: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Falló al desactualizar: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Falla al actualizar: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Obteniendo clave desde %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "La obtención de la llave GPG ha fallado:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" - "La firma de la clave GPG de %s no conincide con la clave CA del repositorio:" - " %s" +-msgstr "" +-"La firma de la clave GPG de %s no conincide con la clave CA del repositorio:" +-" %s" ++msgstr "La firma de la clave GPG de %s no conincide con la clave CA del repositorio: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "Clave GPG de firma verificada contra clave(s) CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Llave GPG no válida de %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "El análisis de la llave GPG ha fallado: la llave no posee valor %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" Package : %s (%s)\n" -+" From : %s" - msgstr "" +-msgstr "" -"Importando clave %s 0x%s:\n" -" Id Usuario: %s\n" -" Paquete: %s (%s)\n" -" Desde: %s" -+"Importando llave %s 0x%s:\n" -+" Usuarioid : \"%s\"\n" -+" Huella : %s\n" -+" Paquete : %s (%s)\n" -+" Desde : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" ++msgstr "Importando llave %s 0x%s:\n Usuarioid : \"%s\"\n Huella : %s\n Paquete : %s (%s)\n Desde : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" From : %s" - msgstr "" +-msgstr "" -"Importando clave %s 0x%s:\n" -" Id Usuario: \"%s\"\n" -" Desde: %s" -+"Importando llave %s 0x%s:\n" -+" Usuarioid : \"%s\"\n" -+" Huella : %s\n" -+" Desde : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" ++msgstr "Importando llave %s 0x%s:\n Usuarioid : \"%s\"\n Huella : %s\n Desde : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "La importación de la llave falló (código %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "La llave ha sido importada exitosamente" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "No instalar ninguna clave" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -3016,26 +3150,26 @@ msgstr "" - "Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n" - "Verifique que las URLs de la llave para este repositorio estén correctamente configuradas." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n" +-"Verifique que las URLs de la llave para este repositorio estén correctamente configuradas." ++msgstr "Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\nVerifique que las URLs de la llave para este repositorio estén correctamente configuradas." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "" - "La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?" +-msgstr "" +-"La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?" ++msgstr "La importación de la(s) llave(s) no funcionó, ¿llave(s) equivocada(s)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "La llave GPG de %s (0x%s) ya ha sido importada" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Falló la importación de la llave" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "No instalar ninguna clave para el repositorio %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3044,164 +3178,188 @@ msgstr "" - "Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero no son correctas.\n" - "Verifique que se encuentren correctamente configuradas las URLs de la llave para este repositorio." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero no son correctas.\n" +-"Verifique que se encuentren correctamente configuradas las URLs de la llave para este repositorio." ++msgstr "Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero no son correctas.\nVerifique que se encuentren correctamente configuradas las URLs de la llave para este repositorio." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "No es posible encontrar un espejo que funcione." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Fueron encontrados errores mientras los paquetes eran descargados." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Por favor, informe este error en %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Errores de la prueba de transacción:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "No se ha podido definir un directorio de chaché: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" - "Dependencias no resueltas. No se guardarán las transacciónes no resuletas." +-msgstr "" +-"Dependencias no resueltas. No se guardarán las transacciónes no resuletas." ++msgstr "Dependencias no resueltas. No se guardarán las transacciónes no resuletas." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "No se puedo guardar el archivo de transacciones %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "No se puede acceder/leer el archivo guardado de transacción %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "versión de rpmdb no coincide con versión de transacción guardada, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " ignorando, como fue requerido." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " abortando." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "no se puede encontrar tsflags o tsflags no es un entero." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Encontrado txmbr en estado actual desconocido: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "No se pudo encontrar txmbr: %s en estado %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "No se pudo encontrar txmbr: %s del origen:%s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," - msgstr "" - "Están faltando los miembros de la transacción y sus relaciones, o ts fue " - "modificada," +-msgstr "" +-"Están faltando los miembros de la transacción y sus relaciones, o ts fue " +-"modificada," ++msgstr "Están faltando los miembros de la transacción y sus relaciones, o ts fue modificada," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " ignorando, a pedido. ¡Debe resolver dependencias nuevamente!" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s ya ha sido visitado y no puede ser removido." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Examinando revdeps de %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s tiene como revdep a %s que fue instalado por el usuario." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s no tiene revdeps instaladas por el usuario." @@ -36733,8 +37577,9 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/plugins.py:262 #, python-format msgid "Not loading \"%s\" plugin, as it is disabled" - msgstr "" - "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" +-msgstr "" +-"El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" ++msgstr "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado" #. Give full backtrace: -#: ../yum/plugins.py:271 @@ -36765,9 +37610,10 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda " - "de complementos " +-msgstr "" +-"Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda " +-"de complementos " ++msgstr "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda de complementos " -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -36781,8 +37627,9 @@ index 2b1397d..a4d0a5d 100644 +#: ../yum/plugins.py:349 #, python-format msgid "Unable to find configuration file for plugin %s" - msgstr "" - "No es posible encontrar el archivo de configuración para el complemento %s" +-msgstr "" +-"No es posible encontrar el archivo de configuración para el complemento %s" ++msgstr "No es posible encontrar el archivo de configuración para el complemento %s" -#: ../yum/plugins.py:508 +#: ../yum/plugins.py:553 @@ -36816,29 +37663,48 @@ index 2b1397d..a4d0a5d 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s ofrece %s, pero no puede ser encontrado" -@@ -3210,6 +3368,17 @@ msgstr "%s ofrece %s, pero no puede ser encontrado" +@@ -3210,6 +3206,19 @@ msgstr "%s ofrece %s, pero no puede ser encontrado" msgid "Repackaging" msgstr "Reempaquetando" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Comprobar: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Espacio insuficiente en el directorio de descarga %s\n" -+" * libre %s\n" -+" * necesario %s" ++msgstr "Espacio insuficiente en el directorio de descarga %s\n * libre %s\n * necesario %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3222,9 +3231,7 @@ msgstr "El RPM %s ha fallado la verificación md5" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se " +-"encuentre en uso?" ++msgstr "No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se encuentre en uso?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3240,5 +3247,3 @@ msgstr "Encabezado %s dañado" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Error al abrir el rpm %s - error %s" +- +- diff --git a/po/eu.po b/po/eu.po -index f92862c..fed775a 100644 +index f92862c..a07067a 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -2,14 +2,15 @@ +@@ -2,947 +2,958 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -36848,22 +37714,24 @@ index f92862c..fed775a 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" -+"Last-Translator: james \n" - "Language-Team: Basque (http://www.transifex.net/projects/p/yum/team/eu/)\n" +-"Language-Team: Basque (http://www.transifex.net/projects/p/yum/team/eu/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2012-01-10 21:58+0000\n" ++"Last-Translator: assar \n" ++"Language-Team: Basque (http://www.transifex.net/projects/p/yum/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Eguneratzen" @@ -36874,31 +37742,31 @@ index f92862c..fed775a 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalatzen" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Zaharkitua" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Eguneratua" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Ezabatua" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Instalatua" @@ -36925,7 +37793,7 @@ index f92862c..fed775a 100644 msgstr "Ezabatua: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Kentzen" @@ -36935,69 +37803,69 @@ index f92862c..fed775a 100644 msgstr "Garbitzen" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "\"%s\" komandoa jadanik definitua" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Biltegiak konfiguratzen" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Biltegien metadatuak irakurtzen fitxategi lokaletatik" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurazio-errorea: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Aukeren errorea: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instalatua: %s-%s %s-(e)n" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Eraikia : %s %s-(e)n" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Egikaritua: %s %s-(e)n" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Komandoren bat eman behar duzu" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Ez dago halako komandorik: %s. Erabili %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Disko-eskakizunak:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Gutxienez %dMD gehiagoko espazioa behar da %s fitxategi-sisteman.\n" @@ -37008,103 +37876,106 @@ index f92862c..fed775a 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,61 +143,61 @@ msgstr "" - "Erroreen laburpena\n" - "-------------\n" +-msgstr "" +-"Erroreen laburpena\n" +-"-------------\n" ++msgstr "Erroreen laburpena\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Transakzioaren exekuzioa saiatzen baina ez dago egiteko ezer. Irteten." +-msgstr "" +-"Transakzioaren exekuzioa saiatzen baina ez dago egiteko ezer. Irteten." ++msgstr "Transakzioaren exekuzioa saiatzen baina ez dago egiteko ezer. Irteten." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Irteten erabiltzaile-komandoaren ondoren" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Paketeak deskargatzen:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Errorea paketeak deskargatzean:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Transakzio-egiaztapena exekutatzen" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ERROREA, rpm eguneratu behar duzu hau maneiatzeko:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "ERROREA transakzio-egiaztapena eta depsolve artean:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM eguneratu egin behar da" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Jakinarazi errore hau %s-(e)n" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Transakzio-testa exekutatzen" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Transakzioaren egiaztapen-errorea:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Transakzio-testak arrakasta izan du" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Transakzioa exekutatzen" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -202,91 +205,110 @@ msgstr "" - "Baztertzen gakoak automatikoki inportatzea arretarik gabe exekutatzen ari denean.\n" - "Erabili \"-y\" gainidazteko." +-msgstr "" +-"Baztertzen gakoak automatikoki inportatzea arretarik gabe exekutatzen ari denean.\n" +-"Erabili \"-y\" gainidazteko." ++msgstr "Baztertzen gakoak automatikoki inportatzea arretarik gabe exekutatzen ari denean.\nErabili \"-y\" gainidazteko." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Agian hau esan nahi zenuen: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "%s%s%s paketea(k) eskuragarri, baina ez daude instalatuta." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "%s%s%s paketea ez dago eskuragarri." @@ -37112,83 +37983,83 @@ index f92862c..fed775a 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Instalatzeko paketea(k)" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d instalatzeko" ++msgstr[1] "%d pakete instalatzeko" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Ez dago egiteko ezer" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakete markatu dira eguneratuak izateko" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d markatu da eguneratua izateko" ++msgstr[1] "%d pakete markatu dira eguneratuak izateko" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Ez da paketerik markatu eguneratua izateko" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakete markatu dira banaketa sinkronizatzeko" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d markatu da banaketa sinkronizatzeko" ++msgstr[1] "%d pakete markatu dira banaketa sinkronizatzeko" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Ez da paketerik markatu banaketa sinkronizatzeko" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakete markatu dira kenduak izateko" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d markatu da kendua izateko" ++msgstr[1] "%d pakete markatu dira kenduak izateko" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Ez da paketerik markatu kendua izateko" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Bertsio zaharragoa instalatzeko paketea(k)" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d bertsio zaharragoa instalatzeko" ++msgstr[1] "%d pakete bertsio zaharragoa instalatzeko" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (%s-(e)tik)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "%s%s%s%s pakete instalatua ez dago eskuragarri." @@ -37196,744 +38067,755 @@ index f92862c..fed775a 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Berrinstalatzeko paketea(k)" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d berrinstalatzeko" ++msgstr[1] "%d pakete berrinstalatzeko" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Ez da paketerik adierazi" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Instalatzeko paketea(k)" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "N/S bat etortze: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Izen eta laburpenen bat etortzeak %soilik%s, erabili \"bilatu dena\" " - "denean bilaketa egiteko." +-msgstr "" +-" Izen eta laburpenen bat etortzeak %soilik%s, erabili \"bilatu dena\" " +-"denean bilaketa egiteko." ++msgstr " Izen eta laburpenen bat etortzeak %soilik%s, erabili \"bilatu dena\" denean bilaketa egiteko." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -294,149 +316,153 @@ msgstr "" - " Izen osoen eta laburpenen bat etortzeak %soilik%s, erabili \"bilatu dena\"" - " denean bilaketa egiteko." +-msgstr "" +-" Izen osoen eta laburpenen bat etortzeak %soilik%s, erabili \"bilatu dena\"" +-" denean bilaketa egiteko." ++msgstr " Izen osoen eta laburpenen bat etortzeak %soilik%s, erabili \"bilatu dena\" denean bilaketa egiteko." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Bat dator: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " Izen eta laburpenen bat etortzeak %sgehien bat%s, erabili \"bilatu dena\" " - "denean bilaketa egiteko." +-msgstr "" +-" Izen eta laburpenen bat etortzeak %sgehien bat%s, erabili \"bilatu dena\" " +-"denean bilaketa egiteko." ++msgstr " Izen eta laburpenen bat etortzeak %sgehien bat%s, erabili \"bilatu dena\" denean bilaketa egiteko." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Abisua: Ez da bat datorrenik aurkitu honentzako: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Ez da parekatzerik aurkitu" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Ez da paketerik aurkitu %s-(e)rako" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Biltegiak garbitzen: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Dena garbitzen" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Goiburuak garbitzen" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Paketeak garbitzen" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "XML metadatuak garbitzen" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Datu-basearen katxea garbitzen" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Metadatuen expire-cache garbitzen" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Katxetutako rpmdb datuak garbitzen" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "pluginak garbitzen" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Abisua: Ez dago taldeen bat etortzerik: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Talde instalatuak:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Instalatutako hizkuntza-taldeak:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Talde eskuragarriak:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Eskuragarri dauden hizkuntza-taldeak:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Egina" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Abisua: %s taldea ez da existitzen." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "Eskatutako taldean ez dago paketerik instalatzeko edo eguneratzeko" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakete instalatzeko" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d instalatzeko" ++msgstr[1] "%d pakete instalatzeko" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Ez da existitzen %s izena duen talderik" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Ez dago paketerik taldeetatik kentzeko" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakete kentzeko" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d kentzeko" ++msgstr[1] "%d pakete kentzeko" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "%s paketea instalatuta dago, saltatzen" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Alderagarria ez den pkg %s.%s baztertzen" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Ez dago beste %s-(e)rik instalatuta, zerrendara gehitzen balizko instalazio " - "baterako" +-msgstr "" +-"Ez dago beste %s-(e)rik instalatuta, zerrendara gehitzen balizko instalazio " +-"baterako" ++msgstr "Ez dago beste %s-(e)rik instalatuta, zerrendara gehitzen balizko instalazio baterako" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Plugin aukerak" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Komando-lerroko errorea: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -447,285 +473,289 @@ msgstr "" "\n" - "%s: %s aukerak argumentua behar du" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s aukerak argumentua behar du" ++msgstr "\n\n%s: %s aukerak argumentua behar du" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color aukerak hauetako bat hartzen du: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot-ek bide-izen absolutua izan behar du: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "erakutsi laguntza-mezu hau eta irten" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "erroreekiko tolerantea izan" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "exekutatu osorik sistemaren katxetik, ez eguneratu katxea" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "konfigurazio-fitxategiaren kokapena" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "komandoen itxarote-denbora maximoa" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "arazketa-irteeraren maila" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "erakutsi bikoiztuak, biltegietan, zerrenda/bilaketa komandoetan" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "errore-irteeraren maila" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "arazketa-irteeraren maila rpm-rako" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "eragiketa lasaia" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "eragiketa berritsua" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "erantzun bai galdera guztiei" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" -+msgstr "" ++msgstr "erantzun ez galdera guztiei" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "erakutsi Yum bertsioa eta irten" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "ezarri instalazio-erroa" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "gaitu biltegi bat edo gehiago (komodinak onartzen dira)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "desgaitu biltegi bat edo gehiago (komodinak onartzen dira)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "baztertu paketea(k) izenaren edo glob-aren arabera" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "desgaitu bazterketa main-etik, biltegi batetik edo denetik" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "gaitu zaharkituen prozesatzea eguneraketetan" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "desagitu Yum-en pluginak" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "desgaitu gpg sinaduren egiaztatzea" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "desgaitu pluginak izenaren arabera" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "gaitu pluginak izenaren arabera" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "saltatu mendekotasun-arazoak dituzten paketeak" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontrolatu kolorea erabiliko den" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "ezarri $releasever balioa yum-en konfigurazioan eta biltegi-fitxategietan" +-msgstr "" +-"ezarri $releasever balioa yum-en konfigurazioan eta biltegi-fitxategietan" ++msgstr "ezarri $releasever balioa yum-en konfigurazioan eta biltegi-fitxategietan" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "ezarri konfigurazio- eta biltegi-aukera arbitrarioak" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "urt." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "ots." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "mar." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "api." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "mai." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "eka." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "uzt." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "abu." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "ira." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "urr." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "aza." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "abe." -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Beste ispilu bat probatzen." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Izena : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arkitektura : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Garaia : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Bertsioa : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Argitalpena : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Tamaina : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Biltegia : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Biltegitik : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Bidaltzailea : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Bidaltze-data : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Eraikitze-data : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Instalazio-ordua: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Instalatzailea: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Aldatzailea: %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Laburpena : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URLa : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Lizentzia : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Deskribapena: " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "b" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "bai" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "e" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ez" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Ados? [b/E]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -734,154 +764,156 @@ msgstr "" - "\n" - "Taldea: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Taldea: %s" ++msgstr "\nTaldea: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Talde-IDa: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Deskribapena: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Hizkuntza: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Derrigorrezko paketeak:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Pakete lehenetsiak:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Hautazko paketeak:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Baldintzapeko paketeak:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paketea: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Ez dago mendekotasunik pakete honetarako" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " mendekotasuna: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Bete gabeko mendekotasuna" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Bat-egitea hemendik:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Lizentzia : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Fitxategi-izena : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Besterik : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Errorea gertatu da deskarga-tamaina osoa kalkulatzean" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Tamaina osoa: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Deskargaren tamaina osoa: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Tamaina instalatu ondoren: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Errorea gertatu da instalatu ondoren duen tamaina kalkulatzean" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Berrinstalatzen" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Bertsio zaharra instalatzen" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Mendekotasunengatik instalatzen" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Mendekotasunengatik eguneratzen" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Mendekotasunengatik kentzen" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Saltatu egin da (mendekotasun-arazoak)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Ez instalatua" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Ez dago eskuragarri" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paketea" +msgid_plural "Packages" @@ -37941,45 +38823,49 @@ index f92862c..fed775a 100644 +msgstr[1] "Paketeak" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arkitektura" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Bertsioa" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Biltegia" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Tamaina" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " %s%s%s.%s %s ordezten\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -892,57 +924,58 @@ msgstr "" - "Transakzio-laburpena\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Transakzio-laburpena\n" +-"%s\n" ++msgstr "\nTransakzio-laburpena\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalatu %5.5s pakete\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Instalatu" @@ -37987,23 +38873,23 @@ index f92862c..fed775a 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Eguneratu %5.5s pakete\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" -+msgstr "" ++msgstr "Eguneratu" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Kendu %5.5s pakete\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" -+msgstr "" ++msgstr "Kendu" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Berrinstalatu %5.5s pakete\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Berrinstalatu" @@ -38011,322 +38897,325 @@ index f92862c..fed775a 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Instalatu %5.5s paketeren bertsio zaharragoa\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Bertsio zaharra instalatu" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Mendeko paketea" ++msgstr[1] "Mendeko paketeak" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Kendua" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Mendekotasuna kendu da" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Mendekotasuna instalatu da" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Mendekotasuna eguneratu da" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Ordezkatua" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Huts egin du" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "bi" -@@ -950,7 +983,7 @@ msgstr "bi" +@@ -950,566 +961,598 @@ msgstr "bi" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -960,364 +993,416 @@ msgstr "" - "\n" - " Uneko deskarga bertan behera utzi da, %sinterrupt (ktrl-c) berriro%s %s%s%s segundotan\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Uneko deskarga bertan behera utzi da, %sinterrupt (ktrl-c) berriro%s %s%s%s segundotan\n" ++msgstr "\n Uneko deskarga bertan behera utzi da, %sinterrupt (ktrl-c) berriro%s %s%s%s segundotan\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "erabiltzaileak utzia" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Guztira" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Batutako %d transakzioa %d-ra saltatzen, teilakatu egiten baitira" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Ez dago transakziorik" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Transakzio-ID, edo pakete, okerra(k) eman dira" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Komando-lerroa" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Saioa hasteko erabiltzailea" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "IDa" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Data eta ordua" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Ekintza(k)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Aldatua" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Ez da transakzio-IDrik eman" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Transakzio-ID okerra eman da" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Ez da aurkitu emandako transakzio-IDarekin" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Transakzio-ID bat baino gehiago aurkitu da!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Ez da transakzio-IDrik, edo paketerik, eman" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Bertsio zaharra instalatua" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Zaharragoa" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Berriagoa" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Transakzio-IDa :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Hasiera-ordua :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Hasierako rpmdb-a :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u segundo)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minutu)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u ordu)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u egun)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Amaiera-ordua :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Amaierako rpmdb-a :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Erabiltzailea :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Itzulera-kodea :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Abortatua" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Hutsegiteak:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Hutsegitea:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Arrakasta" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Komando-lerroa :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Informazio gehigarri ez-lehenetsia gorde da: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transakzioa honekin burutu da:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Aldatutako paketeak:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Saltatutako paketeak:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb-arazoak:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scriptlet-irteera:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Erroreak:" @@ -38335,17 +39224,17 @@ index f92862c..fed775a 100644 -msgstr "Instalatu" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Mendekotasunak instalatu" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Zaharkitutzat hartzen" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Ezabatu" @@ -38358,297 +39247,320 @@ index f92862c..fed775a 100644 -msgstr "Bertsio zaharra instalatu" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Eguneratu" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Noiz" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Azken eguna" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Azken astea" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Azken 2 asteak" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Azken 3 hilabeteak" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Azken 6 hilabeteak" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Azken urtea" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Duela urtebete inguru" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Ez da %s transakziorik aurkitu" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Transakzioaren IDa:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Historia-informazio gehigarria eskuragarri:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Ez da datu gehigarririk aurkitu izen horrekin" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" -+msgstr "" ++msgstr "Paketea :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" -+msgstr "" ++msgstr "Egoera :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" -+msgstr "" ++msgstr "Tamaina :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" -+msgstr "" ++msgstr "Eraikitze-ostalaria :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" -+msgstr "" ++msgstr "Eraikitze-ordua :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" -+msgstr "" ++msgstr "Paketatzailea :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" -+msgstr "" ++msgstr "Hornitzailea :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" -+msgstr "" ++msgstr "Lizentzia :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" -+msgstr "" ++msgstr "URLa :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" -+msgstr "" ++msgstr "Jatorrizko RPMa :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" -+msgstr "" ++msgstr "Egikaritze-ordua :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" -+msgstr "" ++msgstr "Bidaltzailea :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" -+msgstr "" ++msgstr "Arrazoia :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" -+msgstr "" ++msgstr "Biltegi honetatik :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" -+msgstr "" ++msgstr "Instalatzailea :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" -+msgstr "" ++msgstr "Aldatzailea :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" - msgstr "instalatua" +-msgstr "instalatua" ++msgstr "instalatu" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" - msgstr "eguneraketa bat" +-msgstr "eguneraketa bat" ++msgstr "eguneratu" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" - msgstr "ezabatua" +-msgstr "ezabatua" ++msgstr "ezabatu" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" - msgstr "berrinstalatua" +-msgstr "berrinstalatua" ++msgstr "berrinstalatu" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" - msgstr "bertsio-zahartze bat" +-msgstr "bertsio-zahartze bat" ++msgstr "bertsio-zahartu" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "zaharkitzen" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" - msgstr "eguneratua" +-msgstr "eguneratua" ++msgstr "eguneratu" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" - msgstr "zaharkitua" +-msgstr "zaharkitua" ++msgstr "zaharkitu" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> %s.%s %s:%s-%s paketea %s egingo da" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Transakzio-egiaztapena exekutatzen" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Mendekotasun-ebazpena berrabiarazten aldaketa berriekin." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Amaitu da mendekotasunen ebazpena" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Mendekotasuna prozesatzen: %s %s paketerako" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Paketea mantentzen: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ebatzi gabeko mendekotasuna: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paketea: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1326,7 +1411,7 @@ msgstr "" - "\n" - " Behar du: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Behar du: %s" ++msgstr "\n Behar du: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1335,7 +1420,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1344,7 +1429,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1353,88 +1438,88 @@ msgstr "" - " Ez da aurkitu" +-msgstr "" +-"\n" +-" Ez da aurkitu" ++msgstr "\n Ez da aurkitu" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Eguneratu duena" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Bertsio zaharra hobetsi duena" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Zaharkitutzat hartu duena" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Eskuragarri" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Gatazka prozesatzen: %s-(e)k gatazka du %s-(e)kin" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Transakzio-multzoa sortzen hautatutako paketeekin. Itxaron mesedez." +-msgstr "" +-"--> Transakzio-multzoa sortzen hautatutako paketeekin. Itxaron mesedez." ++msgstr "--> Transakzio-multzoa sortzen hautatutako paketeekin. Itxaron mesedez." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - "---> Goiburua deskargatzen %s-(e)rako, transakzio-multzoan sartua izan " - "dadin." +-msgstr "" +-"---> Goiburua deskargatzen %s-(e)rako, transakzio-multzoan sartua izan " +-"dadin." ++msgstr "---> Goiburua deskargatzen %s-(e)rako, transakzio-multzoan sartua izan dadin." ++ ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Egiaztatzen" -#: ../utils.py:99 +#: ../utils.py:129 @@ -38676,7 +39588,7 @@ index f92862c..fed775a 100644 msgstr "Aztarnatua/Gelditua" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Ezezaguna" @@ -38714,36 +39626,47 @@ index f92862c..fed775a 100644 msgid "" "\n" "\n" -@@ -1444,7 +1529,7 @@ msgstr "" - "\n" - "Irteten erabiltzaileak bertan behera utzi duelako" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Irteten erabiltzaileak bertan behera utzi duelako" ++msgstr "\n\nIrteten erabiltzaileak bertan behera utzi duelako" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1454,7 +1539,7 @@ msgstr "" - "\n" - "Irteten kanalizazio hautsiagatik" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Irteten kanalizazio hautsiagatik" ++msgstr "\n\nIrteten kanalizazio hautsiagatik" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1465,7 +1550,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1473,35 +1558,35 @@ msgstr "" - "Beste aplikazio batek yum blokeatuta dauka; irteten exit_on_lock-en " - "konfiguratuta dagoenari kasu eginez" +-msgstr "" +-"Beste aplikazio batek yum blokeatuta dauka; irteten exit_on_lock-en " +-"konfiguratuta dagoenari kasu eginez" ++msgstr "Beste aplikazio batek yum blokeatuta dauka; irteten exit_on_lock-en konfiguratuta dagoenari kasu eginez" -#: ../utils.py:287 +#: ../utils.py:352 @@ -38784,16 +39707,17 @@ index f92862c..fed775a 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1509,7 +1594,7 @@ msgstr "" - "\n" - "Mendekotasunak ebatzi dira" +-msgstr "" +-"\n" +-"Mendekotasunak ebatzi dira" ++msgstr "\nMendekotasunak ebatzi dira" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Osatua!" -@@ -1521,7 +1606,7 @@ msgstr " Mini erabilera:\n" +@@ -1521,7 +1564,7 @@ msgstr " Mini erabilera:\n" msgid "You need to be root to perform this command." msgstr "Erroa izan behar duzu komando hau exekutatzeko." @@ -38802,9 +39726,23 @@ index f92862c..fed775a 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1549,54 +1634,54 @@ msgstr "" +@@ -1536,475 +1579,482 @@ msgid "" + "will install it for you.\n" "\n" - "Informazio gehiagorako, jarri harremanetan zure banaketa- edo pakete-hornitzailearekin.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Paketeak GPG gakoen bidez egiazta daitezen gaitu duzu. Hori ongi dago. \n" +-"Hala ere, ez daukazu GPG gako publikorik instalatuta. Instalatu nahi dituzun paketeen\n" +-"gakoak deskargatu behar dituzu eta ondoren instalazioa burutu.\n" +-"Hori egiteko, hurrengo komandoa exekuta dezakezu:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Bestela, biltegi baterako erabili nahiko zenukeen gakoaren URLa zehatz dezakezu biltegi-atalaren 'gpgkey' aukeran eta yum-ek zugatik instalatuko du.\n" +-"\n" +-"Informazio gehiagorako, jarri harremanetan zure banaketa- edo pakete-hornitzailearekin.\n" ++msgstr "\nPaketeak GPG gakoen bidez egiazta daitezen gaitu duzu. Hori ongi dago. \nHala ere, ez daukazu GPG gako publikorik instalatuta. Instalatu nahi dituzun paketeen\ngakoak deskargatu behar dituzu eta ondoren instalazioa burutu.\nHori egiteko, hurrengo komandoa exekuta dezakezu:\n rpm --import public.gpg.key\n\n\nBestela, biltegi baterako erabili nahiko zenukeen gakoaren URLa zehatz dezakezu biltegi-atalaren 'gpgkey' aukeran eta yum-ek zugatik instalatuko du.\n\nInformazio gehiagorako, jarri harremanetan zure banaketa- edo pakete-hornitzailearekin.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -38861,17 +39799,21 @@ index f92862c..fed775a 100644 -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 msgid "Error: more than one file given as argument to shell." - msgstr "" - "Errorea: fitxategi bat baino gehiago eman zaio shell-ari argumentu gisa." +-msgstr "" +-"Errorea: fitxategi bat baino gehiago eman zaio shell-ari argumentu gisa." ++msgstr "Errorea: fitxategi bat baino gehiago eman zaio shell-ari argumentu gisa." -#: ../yumcommands.py:148 +#: ../yumcommands.py:192 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1606,307 +1691,296 @@ msgstr "" - " Exekutatu \"yum repolist all\" dauzkazun biltegiak ikusteko.\n" - " Biltegiak gaitzeko, yum-config-manager --enable erabil dezakezu" + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Ez dago biltegirik gaituta.\n" +-" Exekutatu \"yum repolist all\" dauzkazun biltegiak ikusteko.\n" +-" Biltegiak gaitzeko, yum-config-manager --enable erabil dezakezu" ++msgstr "Ez dago biltegirik gaituta.\n Exekutatu \"yum repolist all\" dauzkazun biltegiak ikusteko.\n Biltegiak gaitzeko, yum-config-manager --enable erabil dezakezu" -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -38906,8 +39848,9 @@ index f92862c..fed775a 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "Sinkronizatu instalatutako paketeak eskuragarri dauden azken bertsioetara" +-msgstr "" +-"Sinkronizatu instalatutako paketeak eskuragarri dauden azken bertsioetara" ++msgstr "Sinkronizatu instalatutako paketeak eskuragarri dauden azken bertsioetara" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -38973,7 +39916,7 @@ index f92862c..fed775a 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "" ++msgstr "Erakutsi, edo erabili, taldeen informazioa" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -39002,7 +39945,7 @@ index f92862c..fed775a 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "" ++msgstr "Baliogabeko talde-azpikomandoa, erabili: %s." -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -39104,120 +40047,120 @@ index f92862c..fed775a 100644 msgstr "Erakutsi konfiguratutako software-biltegiak" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "gaitua" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "desgaitua" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Biltegi-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Biltegi-izena : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Biltegi-egoera : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Biltegi-berrikuspena: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Biltegi-etiketak : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Banaketa-biltegi-etiketak: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Biltegi-eguneratua: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Biltegi-pkgs: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Biltegi-tamaina: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Biltegi-baseurl: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Biltegi-metaesteka: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Eguneratua : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Biltegi-ispiluak: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Inoiz ez (azkena: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Berehala (azkena: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segundo (azkena: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Biltegi-iraungipena: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Biltegi-baztertu: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Biltegi-barneratu: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Biltegi-baztertua: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Biltegi-izena: " @@ -39225,192 +40168,198 @@ index f92862c..fed775a 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "biltegi id-a" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "egoera" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "biltegi-izena" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Erakutsi erabilera-mezu laguntzailea" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Ez dago laguntzarik %s-(e)rako" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1916,7 +1990,7 @@ msgstr "" - "\n" - "aliasak: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"aliasak: " ++msgstr "\n\naliasak: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1926,85 +2000,125 @@ msgstr "" - "\n" - "aliasa: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"aliasa: " ++msgstr "\n\naliasa: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Berrinstalazio-prozesua konfiguratzen" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "Berrinstalatu pakete bat" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Bertsio zaharragoaren instalazio-prozesua konfiguratzen" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "Pakete baten bertsio zaharragoa instalatu" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Erakutsi bertsio bat makinarako eta/edo biltegi eskuragarriak." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum bertsio-taldeak:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Taldea :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Paketeak:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Instalatua:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Talde-instalatua:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Eskuragarri:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Talde-eskuragarri:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Erakutsi, edo erabili, transakzio-historia" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" -+msgstr "" ++msgstr "Transakzioak:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" -+msgstr "" ++msgstr "Hasiera-ordua :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" -+msgstr "" ++msgstr "Amaiera-ordua :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" -+msgstr "" ++msgstr "Zenbaketa :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" -+msgstr "" ++msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" -+msgstr "" ++msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" -+msgstr "" ++msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" -+msgstr "" ++msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" -+msgstr "" ++msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" -+msgstr "" ++msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Baliogabeko historia-azpikomandoa, erabili: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Ez daukazu historiaren DBra sartzeko baimenik." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Begiratu arazorik dagoen rpmdb-an" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "kargatu gordetako transakzio bat fitxategi-izen batetik" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "Ez da gordetako transakzioaren fitxategia adierazi." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "transakzioa kargatzen %s fitxategitik" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transakzioa kargatua %s-(e)tik, %s kide" -@@ -2015,28 +2129,32 @@ msgstr "Transakzioa kargatua %s-(e)tik, %s kide" +@@ -2015,106 +2065,106 @@ msgstr "Transakzioa kargatua %s-(e)tik, %s kide" msgid " Yum checks failed: %s" msgstr " Yum egiaztapenak huts egin du: %s" @@ -39420,7 +40369,7 @@ index f92862c..fed775a 100644 -msgstr "Beste aplikazio batek yum blokeatuta dauka; irten dadin itxaroten..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" ++msgstr "Ez dago irakurtzeko/exekutatzeko baimenik uneko direktorioan, errora mugitzen" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -39442,291 +40391,300 @@ index f92862c..fed775a 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" +-msgstr "" +-"Zure transakzioa gorde egin da, berrexekutatzeko erabili hau: yum load-" +-"transacion %s" +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" - msgstr "" --"Zure transakzioa gorde egin da, berrexekutatzeko erabili hau: yum load-" --"transacion %s" ++msgstr "Zure transakzioa gorde egin da, berrexekutatzeko erabili hau:\n yum load-transacion %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2046,75 +2164,75 @@ msgstr "" - "\n" - "Irteten erabiltzeileak eragiketa bertan behera utzi duelako." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Irteten erabiltzeileak eragiketa bertan behera utzi duelako." ++msgstr "\n\nIrteten erabiltzeileak eragiketa bertan behera utzi duelako." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" - msgstr "" - "Transakzio-multzoak konfiguratzen konfigurazio-klasea aktibatu baino lehen" +-msgstr "" +-"Transakzio-multzoak konfiguratzen konfigurazio-klasea aktibatu baino lehen" ++msgstr "Transakzio-multzoak konfiguratzen konfigurazio-klasea aktibatu baino lehen" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Baliogabeko tsflag konfigurazio-fitxategian: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Bilatzen pkgSack mendekotasunetarako: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Kidea: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s bihurtu instalatzeko" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "%s paketea gehitzen %s moduan" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "%s paketea kentzen" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s-(e)k behar du: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s-(e)k %s behar du" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Beharrezko eskakizuna blokeatu da jadanik" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Beharrezko eskakizuna ez da pakete-izena. Bilatzen: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Balizko hornitzailea: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Modua %s da %s-(r)en hornitzailerako: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "pkg-rako moduak %s-(e)az hornitzen: %s" -@@ -2122,116 +2240,116 @@ msgstr "pkg-rako moduak %s-(e)az hornitzen: %s" +@@ -2122,1044 +2172,1029 @@ msgstr "pkg-rako moduak %s-(e)az hornitzen: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "%s eguneratzen saiatzen dep konpontzeko" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Ez da eguneratze-biderik aurkitu %s-(e)rako Hutsegitea!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s paketeak behar duen %s ezabatzeko markatu da" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: %s zaharkitu bihurtzen %s ordez, mendekotasuna konpontzeko." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: %s eguneratzen mendekotasuna konpontzeko." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Ezin da eguneraketa-biderik aurkitu %s-(e)rako" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "%s-(r)en bat etortze azkarra %s-(e)rako behar delako" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s hornitutako paketeetan dago baina jadanik instalatuta dago, kentzen." +-msgstr "" +-"%s hornitutako paketeetan dago baina jadanik instalatuta dago, kentzen." ++msgstr "%s hornitutako paketeetan dago baina jadanik instalatuta dago, kentzen." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Konponketak ekar ditzakeen %s paketeak instantzia berria du ts-n." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "Konponketak ekar ditzakeen %s paketeak instantzia berria du instalatuta." +-msgstr "" +-"Konponketak ekar ditzakeen %s paketeak instantzia berria du instalatuta." ++msgstr "Konponketak ekar ditzakeen %s paketeak instantzia berria du instalatuta." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s jadanik tx-en, saltatzen hau" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s markatzen %s-(r)en eguneraketa gisa" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: %s markatzen %s-(r)en instalazio gisa" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Arrakasta - transakzio hutsa" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Berrabiarazten begizta" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Amaitzen mendekotasun-prozesatzea" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Arrakasta - mendekotasunak konpondu dira" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "%s-(r)en mendekotasunak egiaztatzen" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "%s bilatzen %s-(e)k behar duelako" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "compare_providers() exekutatzen %s-(e)rako" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "Arkitektura hobea %s po-an" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s-(e)k %s zaharkitu bihurtzen du" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2240,146 +2358,146 @@ msgstr "" - "%s eta %s alderatu dira %s-(e)n\n" - " Irabazlea: %s" + " Winner: %s" +-msgstr "" +-"%s eta %s alderatu dira %s-(e)n\n" +-" Irabazlea: %s" ++msgstr "%s eta %s alderatu dira %s-(e)n\n Irabazlea: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "%s eta %s sourcerpm komuna" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "%s oinarrizko paketea instalatu da %s-(e)rako" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "%s-(r)en aurrizki komuna %s eta %s artean" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "minimoa behar du: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Irabazlea: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Galtzailea (%d-(r)ekin): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Ordenarik onena: %s" @@ -39734,8 +40692,9 @@ index f92862c..fed775a 100644 -#: ../yum/__init__.py:234 +#: ../yum/__init__.py:261 msgid "doConfigSetup() will go away in a future version of Yum.\n" - msgstr "" - "doConfigSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" +-msgstr "" +-"doConfigSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" ++msgstr "doConfigSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" -#: ../yum/__init__.py:482 +#: ../yum/__init__.py:527 @@ -39757,8 +40716,9 @@ index f92862c..fed775a 100644 -#: ../yum/__init__.py:533 +#: ../yum/__init__.py:580 msgid "doRpmDBSetup() will go away in a future version of Yum.\n" - msgstr "" - "doRpmDBSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" +-msgstr "" +-"doRpmDBSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" ++msgstr "doRpmDBSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" -#: ../yum/__init__.py:544 +#: ../yum/__init__.py:591 @@ -39794,8 +40754,9 @@ index f92862c..fed775a 100644 -#: ../yum/__init__.py:711 +#: ../yum/__init__.py:776 msgid "doUpdateSetup() will go away in a future version of Yum.\n" - msgstr "" - "doUpdateSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" +-msgstr "" +-"doUpdateSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" ++msgstr "doUpdateSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" -#: ../yum/__init__.py:723 +#: ../yum/__init__.py:788 @@ -39805,8 +40766,9 @@ index f92862c..fed775a 100644 -#: ../yum/__init__.py:765 +#: ../yum/__init__.py:832 msgid "doGroupSetup() will go away in a future version of Yum.\n" - msgstr "" - "doGroupSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" +-msgstr "" +-"doGroupSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" ++msgstr "doGroupSetup() desagertu egingo da yum-en etorkizuneko bertsio batean.\n" -#: ../yum/__init__.py:790 +#: ../yum/__init__.py:857 @@ -39863,9 +40825,10 @@ index f92862c..fed775a 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2387,21 +2505,21 @@ msgstr "" - "Amaitu gabeko transakzioak geratu dira. Lehenengo yum-complete-transaction " - "exekutatu beharko zenuke haiek amaitzeko." +-msgstr "" +-"Amaitu gabeko transakzioak geratu dira. Lehenengo yum-complete-transaction " +-"exekutatu beharko zenuke haiek amaitzeko." ++msgstr "Amaitu gabeko transakzioak geratu dira. Lehenengo yum-complete-transaction exekutatu beharko zenuke haiek amaitzeko." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -39889,9 +40852,10 @@ index f92862c..fed775a 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2409,91 +2527,94 @@ msgstr "" - "\n" - "Mendekotasun-arazoengatik saltatutako paketeak:" +-msgstr "" +-"\n" +-"Mendekotasun-arazoengatik saltatutako paketeak:" ++msgstr "\nMendekotasun-arazoengatik saltatutako paketeak:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -39904,9 +40868,10 @@ index f92862c..fed775a 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Aurretiaz existitzen ziren %d rpmdb arazo aurkitu dira, 'yum check' " - "aginduak hurrengoa ematen du:" +-msgstr "" +-"** Aurretiaz existitzen ziren %d rpmdb arazo aurkitu dira, 'yum check' " +-"aginduak hurrengoa ematen du:" ++msgstr "** Aurretiaz existitzen ziren %d rpmdb arazo aurkitu dira, 'yum check' aginduak hurrengoa ematen du:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -39927,9 +40892,10 @@ index f92862c..fed775a 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Abisua: transakzioan zehar erroreak scriptlet-ekin edo beste errore ez-larri" - " batzuk gertatu dira" +-msgstr "" +-"Abisua: transakzioan zehar erroreak scriptlet-ekin edo beste errore ez-larri" +-" batzuk gertatu dira" ++msgstr "Abisua: transakzioan zehar erroreak scriptlet-ekin edo beste errore ez-larri batzuk gertatu dira" -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -39951,7 +40917,7 @@ index f92862c..fed775a 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s instalatuko zela uste zen baina ez dago instalatuta!" @@ -39962,67 +40928,80 @@ index f92862c..fed775a 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s kenduko zela uste zen baina ez da kendu!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" - msgstr "Ezin da %s blokeoa ireki: %s" +-msgid "Could not open lock %s: %s" +-msgstr "Ezin da %s blokeoa ireki: %s" ++msgid "Existing lock %s: another copy is running as pid %s." ++msgstr "%s blokeoa existitzen da: beste kopia bat %s PIDarekin ari da exekutatzen" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Ezin izan da egiaztatu %s PIDa aktibo dagoen ala ez" +-msgid "Unable to check if PID %s is active" +-msgstr "Ezin izan da egiaztatu %s PIDa aktibo dagoen ala ez" ++msgid "Could not create lock at %s: %s " ++msgstr "Ezin izan da blokeoa sortu %s-(e)n: %s " - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." - msgstr "" - "%s blokeoa existitzen da: beste kopia bat %s PIDarekin ari da exekutatzen" +-msgid "Existing lock %s: another copy is running as pid %s." +-msgstr "" +-"%s blokeoa existitzen da: beste kopia bat %s PIDarekin ari da exekutatzen" ++msgid "Could not open lock %s: %s" ++msgstr "Ezin da %s blokeoa ireki: %s" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " - msgstr "Ezin izan da blokeoa sortu %s-(e)n: %s " +-msgid "Could not create lock at %s: %s " +-msgstr "Ezin izan da blokeoa sortu %s-(e)n: %s " ++msgid "Unable to check if PID %s is active" ++msgstr "Ezin izan da egiaztatu %s PIDa aktibo dagoen ala ez" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2502,41 +2623,30 @@ msgstr "" - "Paketea ez dator bat esandako deskargarekin. Iradokizuna: exekutatu yum " "--enablerepo=%s clean metadata" +-msgstr "" +-"Paketea ez dator bat esandako deskargarekin. Iradokizuna: exekutatu yum " +-"--enablerepo=%s clean metadata" ++msgstr "Paketea ez dator bat esandako deskargarekin. Iradokizuna: exekutatu yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Ezin izan da checksum-a egin" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Paketea ez dator bat checksum-arekin" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "paketeak huts egin du checksum-ean baina katxea gaituta dago %s-(e)rako" +-msgstr "" +-"paketeak huts egin du checksum-ean baina katxea gaituta dago %s-(e)rako" ++msgstr "paketeak huts egin du checksum-ean baina katxea gaituta dago %s-(e)rako" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "%s-(r)en kopia lokala erabiltzen" @@ -40039,165 +41018,167 @@ index f92862c..fed775a 100644 -" * behar da %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Goiburua ez dago osorik." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2544,62 +2654,64 @@ msgstr "" - "Goiburua ez dago katxe lokalean eta katxea-bakarrik modua dago gaituta. Ezin" - " da %s deskargatu" +-msgstr "" +-"Goiburua ez dago katxe lokalean eta katxea-bakarrik modua dago gaituta. Ezin" +-" da %s deskargatu" ++msgstr "Goiburua ez dago katxe lokalean eta katxea-bakarrik modua dago gaituta. Ezin da %s deskargatu" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "%s-(r)entzako gako publikoa ez dago instalatuta" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Arazoa %s paketea irekitzen" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "%s-(r)entzako gako publikoa ez da fidagarria" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "%s paketea ez dago sinatuta" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Ezin da %s kendu" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s kendu da" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Ezin da %s fitxategi %s kendu" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s fitxategi %s kendu da" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fitxategi kendu dira" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Fitxategi %d %s kendu da" ++msgstr[1] "%d %s fitxategi kendu dira" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Bat etortze bat baino gehiago dago multzoan %s(e)rako" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ezer ez dator bat %s-(r)ekin.%s %s:%s-%s eguneraketatik" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2607,122 +2719,125 @@ msgstr "" - "searchPackages() desagertu egingo da yum-en etorkizuneko bertsio batean." - " Erabili searchGenerator() haren ordez. \n" +-msgstr "" +-"searchPackages() desagertu egingo da yum-en etorkizuneko bertsio batean." +-" Erabili searchGenerator() haren ordez. \n" ++msgstr "searchPackages() desagertu egingo da yum-en etorkizuneko bertsio batean. Erabili searchGenerator() haren ordez. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "%d pakete bilatzen" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "Pakete %d bilatzen" ++msgstr[1] "%d pakete bilatzen" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "Pakete %s bilatzen" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "fitxategi-sarreretan bilatzen" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "hornitze-sarreretan bilatzen" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Ez dago talde-daturik eskuragarri konfiguratutako biltegietarako" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Ez da existitzen %s deritzon talderik" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "%s paketea ez da markatua izan %s taldean" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "%s taldeko %s paketea gehitzen" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Ez dago %s izeneko paketerik eskuragarri instalatua izateko" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Abisua: %s taldeak ez du paketerik." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "%s taldeak %u baldintza-pakete ditu, instalatuak izan daitezkeenak." @@ -40205,146 +41186,151 @@ index f92862c..fed775a 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "%s pakete-tuplea ez da aurkitu pakete-multzoan" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "%s pakete-tuplea ez da aurkitu rpmdb-n" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Baliogabeko bertsio-bandera: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Ez da paketerik aurkitu %s-(e)rako" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Package Object ez da pakete-objektuen instantzia bat" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Ez da instalatzeko ezer zehaztu" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Hornitze birtualen edo fitxategi-hornitzeen bila %s-(e)rako" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Ez dago bat etortzerik argumenturako: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "%s paketea instalatuta dago eta ez dago eskuragarri" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Ez dago paketerik eskuragarri instalatua izateko" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paketea: %s - jadanik transakzio-multzoan" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" - msgstr "" - "%s paketea zaharkitua dago, bere ordezkoa den %s paketea instalatuta dago" +-msgstr "" +-"%s paketea zaharkitua dago, bere ordezkoa den %s paketea instalatuta dago" ++msgstr "%s paketea zaharkitua dago, bere ordezkoa den %s paketea instalatuta dago" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2731,97 +2846,103 @@ msgstr "" - "%s paketea zaharkitua dago, eta bere ordezkoa den %s paketeak ez ditu " - "eskakizunak betetzen" + "requirements" +-msgstr "" +-"%s paketea zaharkitua dago, eta bere ordezkoa den %s paketeak ez ditu " +-"eskakizunak betetzen" ++msgstr "%s paketea zaharkitua dago, eta bere ordezkoa den %s paketeak ez ditu eskakizunak betetzen" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "%s paketea zaharkitua dago, bere ordezkoa %s da, %s instalatzen saiatzen" +-msgstr "" +-"%s paketea zaharkitua dago, bere ordezkoa %s da, %s instalatzen saiatzen" ++msgstr "%s paketea zaharkitua dago, bere ordezkoa %s da, %s instalatzen saiatzen" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "%s paketea jadanik instalatuta dago bere azken bertsioan" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Bat datorren %s paketea jadanik instalatuta dago. Eguneraketak egiaztatzen." +-msgstr "" +-"Bat datorren %s paketea jadanik instalatuta dago. Eguneraketak egiaztatzen." ++msgstr "Bat datorren %s paketea jadanik instalatuta dago. Eguneraketak egiaztatzen." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Dena eguneratzen" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Ez eguneratzen jadanik zaharkitua dagoen paketea: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "" ++msgstr "Ez dago eguneratzeko bat datorren paketerik: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketea zaharkitua dago jadanik: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Ez eguneratzen zaharkitua dagoen paketea: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Ez eguneratzen jadanik eguneratua dagoen paketea: %s.%s %s:%s-%s" @@ -40352,398 +41338,412 @@ index f92862c..fed775a 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Ez dago kentzeko bat datorren paketerik" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "" ++msgstr "Ez dago kentzeko bat datorren paketerik: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Exekutatzen ari den kernela saltatzen: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "%s kentzen transakziotik" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Ezin da ireki: %s. Saltatzen." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "%s aztertzen: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Ezin da lokalean instalatu deltarpm: %s. Saltatzen." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Ezin da %s paketea gehitu transakzioari. Arkitektura ez da bateragarri: %s" +-msgstr "" +-"Ezin da %s paketea gehitu transakzioari. Arkitektura ez da bateragarri: %s" ++msgstr "Ezin da %s paketea gehitu transakzioari. Arkitektura ez da bateragarri: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Ezin da %s paketea instalatu. Instalatutako %s paketeak zaharkitu egin du" +-msgstr "" +-"Ezin da %s paketea instalatu. Instalatutako %s paketeak zaharkitu egin du" ++msgstr "Ezin da %s paketea instalatu. Instalatutako %s paketeak zaharkitu egin du" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2830,7 +2951,7 @@ msgstr "" - "%s paketea ez dago instalatuta, ezin da eguneratu. Exekutatu yum install " - "hura instalatzeko." + "instead." +-msgstr "" +-"%s paketea ez dago instalatuta, ezin da eguneratu. Exekutatu yum install " +-"hura instalatzeko." ++msgstr "%s paketea ez dago instalatuta, ezin da eguneratu. Exekutatu yum install hura instalatzeko." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2839,138 +2960,138 @@ msgstr "" - "%s.%s paketea ez dago instalatua, ezin da eguneratu. Exekutatu yum install " - "hura instalatzeko." + " instead." +-msgstr "" +-"%s.%s paketea ez dago instalatua, ezin da eguneratu. Exekutatu yum install " +-"hura instalatzeko." ++msgstr "%s.%s paketea ez dago instalatua, ezin da eguneratu. Exekutatu yum install hura instalatzeko." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "%s baztertzen" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s markatzen instalatua izateko" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "%s markatzen %s(r)en eguneraketa gisa" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: ez du instalatutako paketea eguneratzen." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Ezin da fitxategia ireki: %s. Saltatzen." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Arazoa berrinstalatzean: kentzeko paketeak ez datoz bat" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Arazoa berrinstalatzean: %s paketea ez dator bat instalazioarekin" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Ez dago paketerik eskuragarri bertsio zaharragoa instalatzeko" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "%s paketeari instalazio anitz onartzen zaizkio, saltatzen" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Ez dago bat etortzerik eskuragarri dagoen paketerako: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Bertsio-berritzea soilik dago eskuragarri pakete honetarako: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Bertsio zaharragoa instalatzeak huts egin du: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "" ++msgstr "Eguneraketak huts egin du: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Gakoa atzitzen %s-(e)tik" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG gakoaren atzipenak huts egin du: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" - "%s gakoaren GPG gako-sinadura ez dator bat biltegiaren CA gakoarekin: %s" +-msgstr "" +-"%s gakoaren GPG gako-sinadura ez dator bat biltegiaren CA gakoarekin: %s" ++msgstr "%s gakoaren GPG gako-sinadura ez dator bat biltegiaren CA gakoarekin: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG gako-sinadura CA gakoen aurka egiaztatu dira" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "GPG gako baliogabea %s-(e)tik: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG gakoaren analisiak huts egin du: gakoak ez dauka %s balioa" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" Package : %s (%s)\n" -+" From : %s" - msgstr "" +-msgstr "" -"%s gakoa inportatzen 0x%s:\n" -" Erabiltzaile-IDa: %s\n" -" Paketea: %s (%s)\n" -" Nondik : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" ++msgstr "%s gakoa inportatzen 0x%s:\n Erabiltzaile-IDa: \"%s\"\n Hatz-marka: %s\n Paketea : %s (%s)\n Nondik : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" From : %s" - msgstr "" +-msgstr "" -"%s gakoa inportatzen 0x%s:\n" -" Erabiltzaile-IDa: \"%s\"\n" -" Nondik : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" ++msgstr "%s gakoa inportatzen 0x%s:\n Erabiltzaile-IDa: \"%s\"\n Hatz-marka: %s\n Nondik : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "%s-(e)ko GPG gakoa (0x%s) jadanik instalatuta dago" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Gakoaren inportazioak huts egin du (%d kodea)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Gakoa ongi inportatu da" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Ez da gakorik instalatu" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2979,25 +3100,25 @@ msgstr "" - "\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak pakete honetarako.\n" - "Egiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak pakete honetarako.\n" +-"Egiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." ++msgstr "\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak pakete honetarako.\nEgiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Gako(ar)en inportazioak ez du balio izan, gako okerra(k)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "%s (0x%s)-(e)ko GPG gakoa jadanik inportatuta dago" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Gakoaren inportazioak huts egin du" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Ez da gakorik instalatu %s biltegirako" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3006,160 +3127,184 @@ msgstr "" - "\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak.\n" - "Egiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak.\n" +-"Egiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." ++msgstr "\"%s\" biltegirako zerrendatu diren GPG gakoak jadanik instalatuta daude, baina ez dira zuzenak.\nEgiaztatu gako URL zuzena konfiguratuta dagoela biltegi honetarako." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Ezin izan da ispilu egokia aurkitu." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Erroreak aurkitu dira paketeak deskargatzean." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Jakinarazi errore hau %s-(e)n" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Probatu transakzio-erroreak: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Ezin izan da katxe-direktorioa ezarri: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" - "Mendekotasunak ez dira konpondu. Ez da gordeko konpondu gabeko transakzioa." +-msgstr "" +-"Mendekotasunak ez dira konpondu. Ez da gordeko konpondu gabeko transakzioa." ++msgstr "Mendekotasunak ez dira konpondu. Ez da gordeko konpondu gabeko transakzioa." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Ezin izan da %s transakzio-fitxategia gorde: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Ezin izan da atzitu/irakurri gordetako %s transakzioa: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "rpmdb ver mismatched saved transaction version, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " ezikusten, eskatu den bezala." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " abortatzen." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "ezin da tsflags aurkitu edo tsflags ez da balio osoa." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "txmbr uneko egoera ezezagunean aurkitu da: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Ezin izan da txmbr aurkitu: %s %s egoeran" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Ezin izan da txmbr aurkitu: %s jatorritik: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Transakzio-kideak, erlazioak galdu dira edo ts aldatua izan da," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " ezikusten, eskatu den bezala. Redepsolve erabili behar duzu!" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." -+msgstr "" ++msgstr "%s jadanik bisitatu da eta ezin da kendu." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" -+msgstr "" ++msgstr "%s paketearen revdep-ak aztertzen" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "" ++msgstr "%s paketeak %s revdep-a du, jadanik erabiltzaileak instalatutakoa." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "" ++msgstr "%s paketeak ez dauka erabiltzaileak instalatutako revdep-ik." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -40792,9 +41792,10 @@ index f92862c..fed775a 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "\"%s\" izena duten bi plugin edo gehiago daude pluginak bilatzeko bide-" - "izenean" +-msgstr "" +-"\"%s\" izena duten bi plugin edo gehiago daude pluginak bilatzeko bide-" +-"izenean" ++msgstr "\"%s\" izena duten bi plugin edo gehiago daude pluginak bilatzeko bide-izenean" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -40842,26 +41843,45 @@ index f92862c..fed775a 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s-(e)k %s hornitzen du baina ezin da aurkitu" -@@ -3168,6 +3313,17 @@ msgstr "%s-(e)k %s hornitzen du baina ezin da aurkitu" +@@ -3168,6 +3203,19 @@ msgstr "%s-(e)k %s hornitzen du baina ezin da aurkitu" msgid "Repackaging" msgstr "Birpaketatzen" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Egiaztatu: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Ez dago aski espaziorik %s deskarga-direktorioan\n" -+" *lekua %s\n" -+" * behar da %s" ++msgstr "Ez dago aski espaziorik %s deskarga-direktorioan\n *lekua %s\n * behar da %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3180,9 +3228,7 @@ msgstr "%s RPMak ez du md5 egiaztapena gainditu" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Ezin izan da RPM datu-basea ireki hura irakurtzeko. Agian norbait erabiltzen" +-" al da?" ++msgstr "Ezin izan da RPM datu-basea ireki hura irakurtzeko. Agian norbait erabiltzen al da?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3198,5 +3244,3 @@ msgstr "%s goiburua hondatuta dago" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Errorea %s rpm irekitzean - %s errorea" +- +- diff --git a/po/fi.po b/po/fi.po -index 269bf15..b550ae2 100644 +index 269bf15..c8216a9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2,14 +2,15 @@ @@ -40874,22 +41894,23 @@ index 269bf15..b550ae2 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" +@@ -17,934 +18,942 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Päivitetään" @@ -40900,31 +41921,31 @@ index 269bf15..b550ae2 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Asennetaan" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Vanhennettu" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Päivitetty" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Poistettu" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Asennettu" @@ -40951,7 +41972,7 @@ index 269bf15..b550ae2 100644 msgstr "Poistettiin: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Poistetaan" @@ -40961,177 +41982,181 @@ index 269bf15..b550ae2 100644 msgstr "Siivotaan" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Komento ”%s” on jo määritelty" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Tehdään asennuslähdeasetuksia" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Luetaan asennuslähteiden metadataa paikallisista tiedostoista" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Asetusvirhe: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Valitsinvirhe: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Asennettiin : %s-%s ajassa %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Käännettiin : %s ajassa %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Suoritettiin: %s ajassa %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Jokin komento on annettava" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Komentoa %s ei ole olemassa. Käytä komentoa %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Vaadittu levytila:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n" ++msgstr[0] "" +msgstr[1] " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,61 +143,61 @@ msgstr "" - "Yhteenveto virheistä\n" - "--------------------\n" +-msgstr "" +-"Yhteenveto virheistä\n" +-"--------------------\n" ++msgstr "Yhteenveto virheistä\n--------------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan." +-msgstr "" +-"Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan." ++msgstr "Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Lopetetaan, käyttäjä antoi lopetuskomennon" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Ladataan paketteja:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Virhe pakettien latauksessa:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM on päivitettävä" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Ilmoita tästä ongelmasta osoitteeseen %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Suoritetaan transaktiotestiä" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Transaktiotarkistuksen virhe:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Transaktiotesti onnistui" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Suoritetaan transaktiota" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -202,238 +205,261 @@ msgstr "" - "Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\n" - "Käytä valitsinta ”-y” tämän muuttamiseksi." +-msgstr "" +-"Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\n" +-"Käytä valitsinta ”-y” tämän muuttamiseksi." ++msgstr "Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\nKäytä valitsinta ”-y” tämän muuttamiseksi." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Tarkoititko: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." - msgstr "" - "Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu." +-msgstr "" +-"Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu." ++msgstr "Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Pakettia %s%s%s ei ole saatavilla." @@ -41139,7 +42164,7 @@ index 269bf15..b550ae2 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Asennettavat paketit" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -41148,13 +42173,13 @@ index 269bf15..b550ae2 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Ei mitään tehtävää" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakettia merkitty päivitettäväksi" @@ -41164,12 +42189,12 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Yhtään pakettia ei ole merkitty päivitettäväksi" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakettia merkitty jakelusynkronointia varten" @@ -41179,12 +42204,12 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Yhtään pakettia ei ole merkitty jakelusynkronointia varten" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakettia merkitty poistettavaksi" @@ -41194,14 +42219,14 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Yhtään pakettia ei ole merkitty poistettavaksi" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Vanhennettavat paketit" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -41209,13 +42234,13 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (asennuslähteestä %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Asennettua pakettia %s%s%s%s ei ole saatavilla." @@ -41223,7 +42248,7 @@ index 269bf15..b550ae2 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Uudelleenasennettavat paketit" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -41231,153 +42256,154 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Yhtään pakettia ei annettu" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Asennettavat paketit" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Löytyi: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Varoitus: hakutuloksia ei löytynyt hakusanalle %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Hakutuloksia ei löytynyt" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Hakusanalla %s ei löytynyt pakettia" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Siivotaan asennuslähteitä:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Siivotaan kaikki" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Siivotaan otsakkeet" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Siivotaan paketit" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Siivotaan XML-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Siivotaan tiedokannan välimuisti" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Siivotaan välimuistin vanhentumiseen liittyvä metadata" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Siivotaan välimuistissa oleva rpm-tietokannan data" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Siivotaan liitännäiset" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Asennetut ryhmät:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Saatavilla olevat ryhmät:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Valmis" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Varoitus: Ryhmää %s ei ole olemassa." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää " - "pakettia" +-msgstr "" +-"Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää " +-"pakettia" ++msgstr "Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää pakettia" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakettia asennettavana" @@ -41387,18 +42413,18 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Ryhmää nimeltä %s ei ole olemassa" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Ei yhtään poistettavaa pakettia ryhmien perusteella" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d poistettavaa pakettia" @@ -41408,605 +42434,620 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paketti %s on jo asennettu, ohitetaan" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Hylätään paketti %s.%s, jota ei voi verrata" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti " - "asennettavien luetteloon" +-msgstr "" +-"Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti " +-"asennettavien luetteloon" ++msgstr "Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti asennettavien luetteloon" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Liitännäisten valitsimet" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Komentorivivirhe: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -444,290 +470,294 @@ msgstr "" "\n" - "%s: valitsin %s vaatii argumentin" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: valitsin %s vaatii argumentin" ++msgstr "\n\n%s: valitsin %s vaatii argumentin" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color vaatii yhden seuraavista argumenteista: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "näytä tämä ohjeviesti ja lopeta" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "hyväksy virheet" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "toimi kokonaan välimuistista, älä päivitä sitä" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "asetustiedoston sijainti" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "komennon suurin odotusaika" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "virheenjäljitystulosteiden taso" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "näytä duplikaatit asennuslähteissä ja list/search-komennoissa" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "virhetulostustaso" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "rpm:n virheenjäljitystulosteiden taso" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "hiljainen toiminta" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "yksityiskohtaset tulosteet" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "vastaa kyllä kaikkiin kysymyksiin" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "näytä Yumin versio ja lopeta" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "aseta asennusjuuri" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" +-msgstr "" +-"ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" ++msgstr "ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" +-msgstr "" +-"poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" ++msgstr "poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "jätä pois paketteja nimen tai jokerimerkkien perusteella" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" - msgstr "" - "ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin " - "asennuslähteelle tai kaikelle" +-msgstr "" +-"ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin " +-"asennuslähteelle tai kaikelle" ++msgstr "ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin asennuslähteelle tai kaikelle" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "ota käyttöön vanhentuneiden pakettien käsittely päivitysten aikana" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "poista Yumin liitännäiset käytöstä" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "poista GPG-allekirjoitusten tarkistus käytöstä" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "poista liitännäisiä käytöstä nimen perusteella" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "ota liitännäisiä käyttöön nimen perusteella" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "ohita paketit, joilla on riippuvuusongelmia" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "käytetäänkö värejä" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "aseta $releasever-muuttujan arvo yumin asetuksissa ja " - "asennuslähdetiedostoissa" +-msgstr "" +-"aseta $releasever-muuttujan arvo yumin asetuksissa ja " +-"asennuslähdetiedostoissa" ++msgstr "aseta $releasever-muuttujan arvo yumin asetuksissa ja asennuslähdetiedostoissa" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "aseta mielivaltaisia asetus- ja asennuslähdevalitsimia" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "tammi" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "helmi" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "maalis" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "huhti" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "touko" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "kesä" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "heinä" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "elo" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "syys" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "loka" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "marras" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "joulu" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Kokeillaan toista peilipalvelinta." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Nimi : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arkkitehtuuri : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoch : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Versio : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Julkaisu : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Koko : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Asennuslähde : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Asennuslähteestä: %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Toimittaja : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Toimitusaika : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Käännösaika : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Asennusaika : %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Asentaja : %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Muuttanut : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Yhteenveto :" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Lisenssi :" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Kuvaus : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "k" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "kyllä" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "e" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ei" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Onko tämä ok [k/E]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -736,154 +766,156 @@ msgstr "" - "\n" - "Ryhmä: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Ryhmä: %s" ++msgstr "\nRyhmä: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Ryhmätunnus: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Kuvaus: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Pakolliset paketit:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Oletuspaketit:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Valinnaiset paketit:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Ehdolliset paketit:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paketti: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Tällä paketilla ei ole riippuvuuksia" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " riippuvuus: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Toteutumaton riippuvuus" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Vastaavuus :" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Lisenssi : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Tiedostonimi: %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Muuta : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Kokonaislatausmäärää laskettaessa tapahtui virhe" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Koko yhteensä: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Ladattavaa yhteensä: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Koko asennettuna: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Asennuskokoa laskettaessa tapahtui virhe" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Asennetaan uudelleen" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Varhennetaan" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Asennetaan riippuvuuksien vuoksi" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Päivitetään riippuvuuksien vuoksi" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Poistetaan riippuvuuksien vuoksi" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Ohitettiin (riippuvuusongelmia)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Ei asennettu" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paketti" +msgid_plural "Packages" -+msgstr[0] "Paketti" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Paketti" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arkkitehtuuri" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versio" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Asennuslähde" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Koko" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " korvaa %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -894,57 +926,58 @@ msgstr "" - "Transaktion yhteenveto\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Transaktion yhteenveto\n" +-"%s\n" ++msgstr "\nTransaktion yhteenveto\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Asennetaan %5.5s paketti(a)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Asennus" @@ -42014,7 +43055,7 @@ index 269bf15..b550ae2 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Päivitetään %5.5s paketti(a)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -42022,7 +43063,7 @@ index 269bf15..b550ae2 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Poistetaan %5.5s paketti(a)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -42030,7 +43071,7 @@ index 269bf15..b550ae2 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Asennetaan uudelleen %5.5s paketti(a)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Uudelleenasennus" @@ -42038,322 +43079,326 @@ index 269bf15..b550ae2 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Varhennetaan %5.5s paketti(a)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Varhennus" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Poistettu" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Poistettu riippuvuuksia" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Asennettu riippuvuuksia" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Päivitetty riippuvuuksia" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Korvattu" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Epäonnistui" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "kahden" -@@ -952,7 +985,7 @@ msgstr "kahden" +@@ -952,566 +961,598 @@ msgstr "kahden" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -963,365 +996,417 @@ msgstr "" - " Nykyinen lataus peruttiin, %skeskeytä (ctrl-c) uudelleen%s %s%s%s sekunnin aikana\n" - "ohjelman lopettamiseksi.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Nykyinen lataus peruttiin, %skeskeytä (ctrl-c) uudelleen%s %s%s%s sekunnin aikana\n" +-"ohjelman lopettamiseksi.\n" ++msgstr "\n Nykyinen lataus peruttiin, %skeskeytä (ctrl-c) uudelleen%s %s%s%s sekunnin aikana\nohjelman lopettamiseksi.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "käyttäjä keskeytti" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Yhteensä" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "A" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "Vanh." -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "P" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "U" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "Varh." -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "P" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Järjestelmä" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Annettu virheellinen transaktiotunnus tai paketit" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Kirjautunut käyttäjä" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "Tunniste" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Päivämäärä ja kellonaika" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Toiminnot" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Muutettu" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Transaktiotunnusta ei annettu" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Annettiin virheellinen transaktiotunnus" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Annettua transaktiotunnusta ei löytynyt" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Löytyi useampi kuin yksi transaktiotunnus!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Transaktiotunnusta tai pakettia ei annettu" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Varhennettu" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Vanhempi" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Uudempi" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Transaktiotunnus :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Aloitusaika :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "RPM-tietokanta alussa :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Lopetusaika :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "RPM-tietokanta lopussa:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Käyttäjä :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Lopetuskoodi :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Keskeytetty" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Epäonnistui:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Onnistui" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Komentorivi :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Tallennetut lisätiedot: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transaktio suoritettiin:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Muutetut paketit:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Ohitetut paketit:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb:n ongelmia:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Sovelman tuloste:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Virheet:" @@ -42362,17 +43407,17 @@ index 269bf15..b550ae2 100644 -msgstr "Asennus" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Riippuvuuden asennus" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Vanhentava" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Poisto" @@ -42385,297 +43430,312 @@ index 269bf15..b550ae2 100644 -msgstr "Varhennus" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Päivitys" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Aika" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Eilen" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Viime viikolla" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Viimeisen kahden viikon aikana" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Viimeisen kolmen kuukauden aikana" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Viimeisen kuuden kuukauden aikana" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Viime vuonna" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Yli vuosi sitten" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Transaktiota %s ei löytynyt" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Transaktiotunnus:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Käytettävissä olevaa historiatietoa:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Lisätietoja ei löytynyt tällä nimellä" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "asennettavaksi" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "poistettavaksi" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "asennettavaksi uudelleen" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "päivitettäväksi" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "vanhennettavaksi" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Suoritetaan transaktiotarkistusta" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." +-msgstr "" +-"--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." ++msgstr "--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Riippuvuuksien tarkistus valmistui" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Käsitellään riipuvuutta: %s paketille: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Pidetään paketti: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ratkaisematon riippuvuus: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paketti: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1330,7 +1415,7 @@ msgstr "" - "\n" - " Vaatii: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Vaatii: %s" ++msgstr "\n Vaatii: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1339,7 +1424,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1348,7 +1433,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1357,85 +1442,85 @@ msgstr "" - " Ei löytynyt" +-msgstr "" +-"\n" +-" Ei löytynyt" ++msgstr "\n Ei löytynyt" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Päivittää" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Varhentaa" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Vanhentaa" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Saatavilla" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Käsitellään ristiriitaa: %s on ristiriidassa paketin %s kanssa" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Täytetään transaktiojoukkoa valituilla paketeilla. Odota hetki." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Ladataan paketin %s otsaketta transaktiojoukkoon lisäämseksi." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Suoritetaan" @@ -42701,7 +43761,7 @@ index 269bf15..b550ae2 100644 msgstr "Jäljitetään/Pysäytetty" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Tuntematon" @@ -42739,36 +43799,47 @@ index 269bf15..b550ae2 100644 msgid "" "\n" "\n" -@@ -1445,7 +1530,7 @@ msgstr "" - "\n" - "Lopetetaan käyttäjän peruttua" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Lopetetaan käyttäjän peruttua" ++msgstr "\n\nLopetetaan käyttäjän peruttua" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1455,7 +1540,7 @@ msgstr "" - "\n" - "Lopetetaan putken katkettua" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Lopetetaan putken katkettua" ++msgstr "\n\nLopetetaan putken katkettua" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1466,7 +1551,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1474,36 +1559,36 @@ msgstr "" - "Toinen ohjelma pitää tällä hetkellä yumin lukkoa. Lopetetaan, kuten " - "exit_on_lock määrää" +-msgstr "" +-"Toinen ohjelma pitää tällä hetkellä yumin lukkoa. Lopetetaan, kuten " +-"exit_on_lock määrää" ++msgstr "Toinen ohjelma pitää tällä hetkellä yumin lukkoa. Lopetetaan, kuten exit_on_lock määrää" -#: ../utils.py:287 +#: ../utils.py:352 @@ -42796,8 +43867,9 @@ index 269bf15..b550ae2 100644 -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 msgid " You could try running: rpm -Va --nofiles --nodigest" - msgstr "" - " Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" +-msgstr "" +-" Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" ++msgstr " Kannattaa myös kokeilla komennon rpm -Va --nofiles --nodigest suorittamista" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 +#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 @@ -42810,16 +43882,17 @@ index 269bf15..b550ae2 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1511,7 +1596,7 @@ msgstr "" - "\n" - "Riippuvuudet on ratkaistu" +-msgstr "" +-"\n" +-"Riippuvuudet on ratkaistu" ++msgstr "\nRiippuvuudet on ratkaistu" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Valmis!" -@@ -1523,7 +1608,7 @@ msgstr "" +@@ -1523,7 +1564,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Vain pääkäyttäjä voi suorittaa tämän komennon." @@ -42828,9 +43901,24 @@ index 269bf15..b550ae2 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1552,54 +1637,54 @@ msgstr "" +@@ -1538,476 +1579,482 @@ msgid "" + "will install it for you.\n" "\n" - "Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Pakettien tarkistaminen GPG-avainten avulla on käytössä, se on hyvä.\n" +-"Yhtään GPG-avainta ei kuitenkaan ole asennettuna. Asennettavaksi aiottuja\n" +-"paketteja varten on ladattava ja asennettava GPG-avaimet.\n" +-"Avaimet voi asentaa suorittamalla komennon:\n" +-" rpm --import julkinen.gpg.avain\n" +-"\n" +-"\n" +-"Käytettävän avaimen URL:n voi määritellä asennuslähteen asetusten\n" +-"”gpgkey”-valitsimella. Tällöin yum asentaa avaimen automaattisesti.\n" +-"\n" +-"Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" ++msgstr "\nPakettien tarkistaminen GPG-avainten avulla on käytössä, se on hyvä.\nYhtään GPG-avainta ei kuitenkaan ole asennettuna. Asennettavaksi aiottuja\npaketteja varten on ladattava ja asennettava GPG-avaimet.\nAvaimet voi asentaa suorittamalla komennon:\n rpm --import julkinen.gpg.avain\n\n\nKäytettävän avaimen URL:n voi määritellä asennuslähteen asetusten\n”gpgkey”-valitsimella. Tällöin yum asentaa avaimen automaattisesti.\n\nLisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -42881,8 +43969,9 @@ index 269bf15..b550ae2 100644 +#: ../yumcommands.py:167 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "" - "Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa." +-msgstr "" +-"Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa." ++msgstr "Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa." -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 @@ -42894,9 +43983,12 @@ index 269bf15..b550ae2 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1609,306 +1694,295 @@ msgstr "" - " Suorita ”yum repolist all” kaikkien asennuslähteiden luettelemiseksi.\n" - " Voit ottaa asennuslähteitä käyttöön komennolla yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Yhtään asennuslähdettä ei ole käytössä.\n" +-" Suorita ”yum repolist all” kaikkien asennuslähteiden luettelemiseksi.\n" +-" Voit ottaa asennuslähteitä käyttöön komennolla yum-config-manager --enable " ++msgstr "Yhtään asennuslähdettä ei ole käytössä.\n Suorita ”yum repolist all” kaikkien asennuslähteiden luettelemiseksi.\n Voit ottaa asennuslähteitä käyttöön komennolla yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -43128,336 +44220,342 @@ index 269bf15..b550ae2 100644 msgstr "Näytä asetetut asennuslähteet" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "käytössä" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "poissa käytöstä" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Lähdetunnus : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Lähdenimi : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Lähteen tila : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Lähderevisio : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Lähteen tagit : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Lähteen jakelutagit: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Lähde päivitetty : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Lähteen paketit : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Lähteen koko : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Lähteen baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Lähteen metalink : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Päivitetty : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Lähteen peilit : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Ei koskaan (viimeksi: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Heti (viimeksi: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekunti(a) (viimeksi: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Lähde vanhentuu : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Lähde ohittaa : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Lähde sisältää : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Lähde ohitettu : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "lähdetunnus" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "tila" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "lähdenimi" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Näytä käyttöohjeviesti" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Ei ohjeita komennolle %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1918,7 +1992,7 @@ msgstr "" - "\n" - "muut nimet: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"muut nimet: " ++msgstr "\n\nmuut nimet: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1928,86 +2002,126 @@ msgstr "" - "\n" - "toinen nimi: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"toinen nimi: " ++msgstr "\n\ntoinen nimi: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Aloitetaan uudelleenasennusprosessi" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "asenna paketti uudelleen" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Aloitetaan varhennusprosessi" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "varhenna paketti" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." - msgstr "" - "Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio" +-msgstr "" +-"Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio" ++msgstr "Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum-versioryhmät:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Ryhmä:" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Paketit:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Asennettu:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Asennettu ryhmässä:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Saatavilla:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Saatavilla ryhmässä:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Näytä tai käytä transaktiohistoriaa" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Virheellinen historyn alikomento, käytä: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Sinulla ei ole historiatietokannan käyttöoikeutta" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Etsi ongelmia rpm-tietokannasta" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -2018,28 +2132,34 @@ msgstr "" +@@ -2018,105 +2065,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." msgstr "" - "Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se " - "lopettaa..." +-"Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se " +-"lopettaa..." -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se lopettaa..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -43478,279 +44576,287 @@ index 269bf15..b550ae2 100644 msgid "" "\n" "\n" -@@ -2049,74 +2169,74 @@ msgstr "" - "\n" - "Lopetetaan käyttäjän peruttua." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Lopetetaan käyttäjän peruttua." ++msgstr "\n\nLopetetaan käyttäjän peruttua." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() poistetaan jossakin Yumin tulevassa versiossa.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Asetetaan TransactionSetsit ennen kuin asetusluokka on käytössä" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Virheellinen tsflag asetustiedostossa: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Etsitään pkgSackista riippuvuutta: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Jäsen: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s muutettu asennukseksi" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Lisätään paketti %s tilassa %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Poistetaan paketti %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s vaatii: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s vaatii %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Tarvittava vaatimus on jo etsitty, huijataan" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Tarvittava vaatimus ei ole pakettinimi. Etsitään: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Mahdollinen tarjoaja: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Tila %s riippuvuuden %s: %s tarjoajalla" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" -@@ -2124,117 +2244,117 @@ msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" +@@ -2124,1025 +2172,1029 @@ msgstr "Riippuvuuden %s: %s tarjoavan paketin tila" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" - "TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi" +-msgstr "" +-"TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi" ++msgstr "TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." +-msgstr "" +-"TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." ++msgstr "TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Päivitetään paketti %s riippuvuuden ratkaisemiseksi." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Päivityspolkua ei löydetty riippuvuudelle: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Pikavastaavuus %s vaatimukselle %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s on tarjoavissa paketeissa, mutta se on jo asennettuna, poistetaan." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi ts:ssä." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." +-msgstr "" +-"Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." ++msgstr "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "paketti %s on jo ts:ssä, ohitetaan" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Merkitään paketti %s päivitykseksi paketille %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Merkitään %s asennukseksi paketille %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Onnistui - tyhjä transaktio" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Käynnistetään silmukka uudelleen" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Riippuvuuksien käsittely päättyy" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Onnistui – riippuvuudet on ratkaistu" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Tarkistetaan paketin %s riippuvuuksia" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "etsitään riippuvuutta %s paketille %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Suoritetaan compare_providers() paketeille %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "po:ssa %s on parempi arkkitehtuuri" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "paketti %s vanhentaa paketin %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2243,142 +2363,142 @@ msgstr "" - "archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n" - " Voittaja: %s" + " Winner: %s" +-msgstr "" +-"archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n" +-" Voittaja: %s" ++msgstr "archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n Voittaja: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "paketeilla %s ja %s on yhteinen lähde-RPM" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "peruspaketti %s on asennettu paketille %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "yhteinen %s merkin mittainen etuliite paketeilla %s ja %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "vaatii vähintään: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Voittaja: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Häviäjä (arvolla %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Paras järjestys %s" @@ -43883,9 +44989,10 @@ index 269bf15..b550ae2 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2386,21 +2506,21 @@ msgstr "" - "Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua" - " suorittaa ensin yum-complete-transaction." +-msgstr "" +-"Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua" +-" suorittaa ensin yum-complete-transaction." ++msgstr "Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua suorittaa ensin yum-complete-transaction." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -43909,9 +45016,10 @@ index 269bf15..b550ae2 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2408,88 +2528,91 @@ msgstr "" - "\n" - "Riippuvuusongelmien vuoksi ohitetut paketit:" +-msgstr "" +-"\n" +-"Riippuvuusongelmien vuoksi ohitetut paketit:" ++msgstr "\nRiippuvuusongelmien vuoksi ohitetut paketit:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -43945,9 +45053,10 @@ index 269bf15..b550ae2 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, " - "tapahtui transaktion aikana." +-msgstr "" +-"Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, " +-"tapahtui transaktion aikana." ++msgstr "Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, tapahtui transaktion aikana." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -43969,7 +45078,7 @@ index 269bf15..b550ae2 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s piti olla asennettuna, mutta se ei ole!" @@ -43980,24 +45089,22 @@ index 269bf15..b550ae2 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s piti olla poistettu, mutta se ei ole!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Lukkoa %s ei voitu avata: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Lukkoa %s ei voitu avata: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Ei voida tarkistaa onko PID %s aktiivinen" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Ei voida tarkistaa onko PID %s aktiivinen" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -44007,39 +45114,54 @@ index 269bf15..b550ae2 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Lukkoa %s ei voitu avata: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Ei voida tarkistaa onko PID %s aktiivinen" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2498,41 +2621,30 @@ msgstr "" - "Paketti ei vastaa odotettua latausta. Ehdotus: suorita yum --enablerepo=%s " - "clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Paketti ei vastaa odotettua latausta. Ehdotus: suorita yum --enablerepo=%s " +-"clean metadata" ++msgstr "Paketti ei vastaa odotettua latausta. Ehdotus: suorita yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Ei voitu laskea tarkistussummaa" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Paketti ei vastaa tarkistussummaa" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" +-msgstr "" +-"paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" ++msgstr "paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "käytetään paikallista kopiota paketista %s" @@ -44056,69 +45178,70 @@ index 269bf15..b550ae2 100644 -" * tarvitaan %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Otsake ei ole täydellinen." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2540,62 +2652,64 @@ msgstr "" - "Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva " - "tila on käytössä. Ei voida ladata otsaketta %s" +-msgstr "" +-"Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva " +-"tila on käytössä. Ei voida ladata otsaketta %s" ++msgstr "Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva tila on käytössä. Ei voida ladata otsaketta %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Julkista avainta pakettia %s varten ei ole asennettu" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Ongelma paketin %s avaamisessa" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Paketin %s julkiseen avaimeen ei luoteta" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Pakettia %s ei ole allekirjoitettu" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Ei voida poistaa tiedostoa %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "tiedosto %s on poistettu" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s-tyyppinen tiedosto %s on poistettu" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s-tyyppistä tiedostoa on poistettu" @@ -44128,28 +45251,29 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Säkissä on useampi kuin yksi identtinen vastaavuus haulle %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Mikään ei vastaa päivityksen pakettia %s.%s %s:%s-%s" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2603,121 +2717,124 @@ msgstr "" - "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " - "sijaan searchGenerator()-metodia.\n" +-msgstr "" +-"searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen " +-"sijaan searchGenerator()-metodia.\n" ++msgstr "searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen sijaan searchGenerator()-metodia.\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Etsitään %d pakettia" @@ -44159,62 +45283,62 @@ index 269bf15..b550ae2 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "etsitään pakettia %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "etsitään tiedostoista" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "etsitään tarjoajista" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Ryhmää nimeltä %s ei ole olemassa" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Lisätään paketti %s ryhmästä %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -44222,144 +45346,147 @@ index 269bf15..b550ae2 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Riippuvuudelle %s ei löytynyt pakettia" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Mitään ei määritelty asennettavaksi" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Mikään ei vastaa argumenttia: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Paketti %s on asennettu, mutta ei saatavilla" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paketti: %s – on jo transaktiojoukossa" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paketin %s vanhentaa paketti %s, joka on jo asennettuna" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2726,83 +2843,89 @@ msgstr "" - "Paketin %s vanhentaa paketti %s, mutta vanhentava paketti ei tarjoa " - "riippuvuuksia" + "requirements" +-msgstr "" +-"Paketin %s vanhentaa paketti %s, mutta vanhentava paketti ei tarjoa " +-"riippuvuuksia" ++msgstr "Paketin %s vanhentaa paketti %s, mutta vanhentava paketti ei tarjoa riippuvuuksia" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paketin %s vanhentaa paketti %s, yritetään paketti %s sen sijaan" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Paketti %s on jo asennettuna ja uusin versio" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." +-msgstr "" +-"Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." ++msgstr "Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Päivitetään kaikki" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Vanhennettua pakettia ei päivitetä: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketti on jo vanhennettu: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Ei päivitetä vanhennettua pakettia: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Jo päivitettyä pakettia ei enää päivitetä: %s.%s %s:%s-%s" @@ -44367,67 +45494,70 @@ index 269bf15..b550ae2 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Ohitetaan käytössä oleva ydin: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Poistetaan %s transaktiosta" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Ei voida avata pakettia: %s. Ohitetaan." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Tutkitaan %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Deltarpm:ää %s ei voi asentaa paikallisesti. Ohitetaan." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2810,12 +2933,12 @@ msgstr "" - "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva:" - " %s" +-msgstr "" +-"Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva:" +-" %s" ++msgstr "Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Pakettia %s ei voi asentaa. Asennettu paketti %s vanhentaa sen." -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2824,139 +2947,146 @@ msgstr "" - "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install " - "-komento paketin asentamiseksi." + "instead." +-msgstr "" +-"Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install " +-"-komento paketin asentamiseksi." ++msgstr "Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install -komento paketin asentamiseksi." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -44435,120 +45565,122 @@ index 269bf15..b550ae2 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Ohitetaan paketti %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Merkitään paketti %s asennettavaksi" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Merkitään paketti %s päivitykseksi paketille %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: ei päivitä asennettua pakettia" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Ei voida avata tiedostoa: %s. Ohitetaan." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" +-msgstr "" +-"Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" ++msgstr "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" +-msgstr "" +-"Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" ++msgstr "Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan." -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Vain päivitys saatavilla paketille: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Varhentaminen epäonnistui: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG-avaimen nouto epäonnistui: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Virheellinen GPG-avain osoitteesta %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG-avaimen jäsentäminen epäonnistui: avaimessa ei ole arvoa %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -44562,7 +45694,7 @@ index 269bf15..b550ae2 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -44574,179 +45706,183 @@ index 269bf15..b550ae2 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Avaimen tuonti epäonnistui (koodi %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Avaimen tuonti onnistui" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2965,25 +3095,25 @@ msgstr "" - "Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne eivät vastaa tätä pakettia.\n" - "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne eivät vastaa tätä pakettia.\n" +-"Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." ++msgstr "Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne eivät vastaa tätä pakettia.\nTarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo tuotu" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Avaimen tuonti epäonnistui" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2992,157 +3122,181 @@ msgstr "" - "Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne ovat virheelliset.\n" - "Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne ovat virheelliset.\n" +-"Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." ++msgstr "Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne ovat virheelliset.\nTarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Sopivaa peilipalvelinta ei löytynyt." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Paketteja ladatessa tapahtui virheitä." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Ilmoita tästä ongelmasta: %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Testitransaktion virheitä: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Välimuistihakemiston asettaminen epäonnistui %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -44846,55 +45982,72 @@ index 269bf15..b550ae2 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s tarjoaa %s, mutta sitä ei löydy" -@@ -3151,6 +3305,17 @@ msgstr "%s tarjoaa %s, mutta sitä ei löydy" +@@ -3151,11 +3203,23 @@ msgstr "%s tarjoaa %s, mutta sitä ei löydy" msgid "Repackaging" msgstr "Paketoidaan uudelleen" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Lataushakemistossa %s ei ole tarpeeksi vapaata tilaa\n" -+" * vapaana %s\n" -+" * tarvitaan %s" ++msgstr "Lataushakemistossa %s ei ole tarpeeksi vapaata tilaa\n * vapaana %s\n * tarvitaan %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +-msgstr "" +-"Otsaketta ei voi avata tai se ei vastaa nimeä ja arkkitehtuuria %s, %s" ++msgstr "Otsaketta ei voi avata tai se ei vastaa nimeä ja arkkitehtuuria %s, %s" + + #: ../rpmUtils/oldUtils.py:53 + #, python-format +@@ -3180,5 +3244,3 @@ msgstr "Vioittunut otsake %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Virhe avattaessa RPM:ää %s – virhe %s" +- +- diff --git a/po/fr.po b/po/fr.po -index 4636b15..a80098f 100644 +index 4636b15..484ddf5 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2,14 +2,16 @@ +@@ -2,958 +2,960 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Kévin Raymond , 2011 +# Translators: +# Dominique Bribanick , 2011. -+# Kévin Raymond , 2011. ++# Kévin Raymond , 2011, 2012. ++# Mathieu LEFEBVRE Mathdabomb , 2012. msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-12-02 20:09+0000\n" -+"Last-Translator: shaiton \n" - "Language-Team: French (http://www.transifex.net/projects/p/yum/team/fr/)\n" +-"Language-Team: French (http://www.transifex.net/projects/p/yum/team/fr/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2012-01-07 19:01+0000\n" ++"Last-Translator: Kévin Raymond \n" ++"Language-Team: French (http://www.transifex.net/projects/p/yum/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +19,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Mise à jour " @@ -44905,34 +46058,35 @@ index 4636b15..a80098f 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" -msgstr "Installation de" +msgstr "Installation de " -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsolète " -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Mis à jour " -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Supprimés " -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" - msgstr "Installé " +-msgstr "Installé " ++msgstr "Installé " -#: ../callback.py:130 +#: ../callback.py:142 @@ -44957,7 +46111,7 @@ index 4636b15..a80098f 100644 msgstr "Supprimé : %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Suppression " @@ -44967,71 +46121,71 @@ index 4636b15..a80098f 100644 msgstr "Nettoyage " -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Commande « %s » déjà définie" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Configuration des dépôts" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 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:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Erreur de configuration : %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Erreur d'options : %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installés : %s-%s à %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" -msgstr " Compilé : %s à %s" +msgstr " Compilé : %s à %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" -msgstr " Commité : %s à %s" +msgstr " Commité : %s à %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Vous devez spécifier des commandes" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Aucune commande telle que : %s. Veuillez utiliser %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Besoins en espace disque :\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Au moins %d Mio requis sur le système de fichiers %s.\n" @@ -45042,105 +46196,109 @@ index 4636b15..a80098f 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,63 +144,63 @@ msgstr "" - "Résumé des erreurs\n" - "-------------\n" +-msgstr "" +-"Résumé des erreurs\n" +-"-------------\n" ++msgstr "Résumé des erreurs\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 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." ++msgstr "Tentative d'exécution de la transaction mais aucune tâche à effectuer. Sortie." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Arrêt à la demande de l'utilisateur" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Téléchargement des paquets :" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Erreur durant le téléchargement des paquets :\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Test de la transaction en cours" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ERREUR Vous devez mettre à jour rpm pour manipuler :" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" - msgstr "" - "ERREUR lors de la vérification de la transaction avec les dépendances :" +-msgstr "" +-"ERREUR lors de la vérification de la transaction avec les dépendances :" ++msgstr "ERREUR lors de la vérification de la transaction avec les dépendances :" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM doit être mis à jour" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Veuillez reporter cette erreur dans %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Lancement de la transaction de test" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Erreur du contrôle de transaction :\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Transaction de test réussie" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Lancement de la transaction" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -204,91 +208,110 @@ msgstr "" - "Refus de l'importation automatique des clés lors d'une exécution inattendue.\n" - "Utilisez l'option « -y » pour passer outre." +-msgstr "" +-"Refus de l'importation automatique des clés lors d'une exécution inattendue.\n" +-"Utilisez l'option « -y » pour passer outre." ++msgstr "Refus de l'importation automatique des clés lors d'une exécution inattendue.\nUtilisez l'option « -y » pour passer outre." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Vouliez-vous dire : " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Le ou les paquets %s%s%s sont disponibles, mais non installés." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Aucun paquet %s%s%s disponible." @@ -45148,7 +46306,7 @@ index 4636b15..a80098f 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paquets à installer" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -45157,13 +46315,13 @@ index 4636b15..a80098f 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Rien à faire" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paquets marqués pour mise à jour" @@ -45173,12 +46331,12 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets à mettre à jour" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Aucun paquet marqué pour mise à jour" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d paquets marqués pour la synchronisation de la distribution" @@ -45188,12 +46346,12 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets marqués pour une synchronisation de distribution" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Aucun paquet marqué pour la synchronisation de la distribution" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paquets marqués pour suppression" @@ -45203,14 +46361,14 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets à supprimer" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Aucun paquet marqué pour suppression" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paquets à rétrograder" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -45218,13 +46376,13 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets à passer à une version antérieur" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "(depuis %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Paquets installés %s%s%s%s indisponibles." @@ -45232,7 +46390,7 @@ index 4636b15..a80098f 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paquets à réinstaller" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -45240,160 +46398,164 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets à réinstaller" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Pas de paquet fourni" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paquets à installer" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "Non spécifié, correspond à : %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Correspondance dans les noms et résumés %suniquement%s, utilisez « search " - "all » pour une recherche complète." +-msgstr "" +-" Correspondance dans les noms et résumés %suniquement%s, utilisez « search " +-"all » pour une recherche complète." ++msgstr " Correspondance dans les noms et résumés %suniquement%s, utilisez « search all » pour une recherche complète." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -296,150 +319,154 @@ msgstr "" - " Correspondance complète dans les noms et résumés %suniquement%s, utilisez " - "« search all » pour une recherche complète." +-msgstr "" +-" Correspondance complète dans les noms et résumés %suniquement%s, utilisez " +-"« search all » pour une recherche complète." ++msgstr " Correspondance complète dans les noms et résumés %suniquement%s, utilisez « search all » pour une recherche complète." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" -msgstr " Marqués : %s" +msgstr "Marqués : %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " Correspondance dans les noms et résumés %sprincipalementt%s, utilisez « " - "search all » pour une recherche complète." +-msgstr "" +-" Correspondance dans les noms et résumés %sprincipalementt%s, utilisez « " +-"search all » pour une recherche complète." ++msgstr " Correspondance dans les noms et résumés %sprincipalementt%s, utilisez « search all » pour une recherche complète." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Attention : aucune correspondance trouvée pour : %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Aucune correspondance trouvée" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Aucun paquet trouvé pour %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Nettoyage des dépôts : " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Nettoyage complet" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Nettoyage des en-têtes" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Nettoyage des paquets" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Nettoyage des méta données xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Nettoyage du cache de la base de données" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Nettoyage des méta données expirées dans le cache" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Nettoyage des données du cache de RPMDB" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Nettoyage des modules complémentaires" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Attention : aucun groupe ne correspond : %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Groupes installés :" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Groupes de langues installés :" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Groupes disponibles :" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Groupes de langues disponibles :" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Effectué" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Attention : le groupe %s n'existe pas." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Aucun paquet disponible pour installation ou mise à jour dans les groupes " - "demandés" +-msgstr "" +-"Aucun paquet disponible pour installation ou mise à jour dans les groupes " +-"demandés" ++msgstr "Aucun paquet disponible pour installation ou mise à jour dans les groupes demandés" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paquet(s) à installer" @@ -45403,18 +46565,18 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets à installer" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Aucun groupe nommé %s n'existe" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Aucun paquet du groupe à supprimer" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paquet(s) à supprimer" @@ -45424,586 +46586,598 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d paquets à désinstaller" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Le paquet %s est déjà installé, omission" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Rejet du paquet non comparable %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, 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" ++msgstr "Pas d'autre %s installé, ajout à la liste pour installation potentielle" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Options du plugin" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Erreur sur la ligne de commande : %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -450,289 +477,293 @@ msgstr "" "\n" - "%s : l'option %s requiert un argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s : l'option %s requiert un argument" ++msgstr "\n\n%s : l'option %s requiert un argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color accepte les paramètres : auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot doit correspondre à un chemin absolu : %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "affiche ce message d'aide et quitte" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "tolère les erreurs" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "exécute entièrement depuis le cache, sans le mettre à jour" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "emplacement du fichier de configuration" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "temps d'attente maximum de la commande" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "niveau de déboguage pour la sortie" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "affiche les doublons dans les dépôts, pour les commandes list/search" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "niveau d'erreur pour la sortie" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "niveau de déboguage pour rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "opération silencieuse" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "opération verbeuse" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "répondre oui à toutes les questions" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "répondre non à toutes les questions" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "affiche la version de Yum et quitte" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "définit la racine d'installation" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "active un ou plusieurs dépôts (jokers autorisés)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "désactive un ou plusieurs dépôts (jokers autorisés)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" - msgstr "" - "exclut des paquets par leur nom (le caractère * générique peut être utilisé)" +-msgstr "" +-"exclut des paquets par leur nom (le caractère * générique peut être utilisé)" ++msgstr "exclut des paquets par leur nom (le caractère * générique peut être utilisé)" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 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" ++msgstr "désactive l'exclusion pour le dépôt principal, pour un dépôt particulier ou pour tout" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "active le traitement des paquets obsolètes pendant les mises à jour" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "désactive les modules complémentaires Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "désactive la vérification de clé gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "désactive les modules complémentaires par nom" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "active les modules complémentaires par nom" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "omettre les paquets qui ont des problèmes de dépendances" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "contrôle l'utilisation de la couleur" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "configuration de la valeur de $releasever dans le fichier de configuration " - "de yum et dans les fichiers des dépôts" +-msgstr "" +-"configuration de la valeur de $releasever dans le fichier de configuration " +-"de yum et dans les fichiers des dépôts" ++msgstr "configuration de la valeur de $releasever dans le fichier de configuration de yum et dans les fichiers des dépôts" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "réinitialise la configuration ainsi que les options des dépôts" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Fév" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mars" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Avr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Mai" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Juin" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jui" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Août" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Oct" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Déc" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Essai d'un autre miroir." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" -msgstr "Nom : %s%s%s" +msgstr "Nom : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Architecture : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" -msgstr "Date : %s" +msgstr "Date : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" -msgstr "Version : %s" +msgstr "Version : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" -msgstr "Révision : %s" +msgstr "Révision : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" -msgstr "Taille : %s" +msgstr "Taille : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" -msgstr "Dépôt  : %s" +msgstr "Dépôt   : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" -msgstr "Depuis le dépôt : %s" +msgstr "Depuis le dépôt : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" -msgstr "Auteur : %s" +msgstr "Auteur : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Date de validation : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" -msgstr "Date de compilation : %s" +msgstr "Date de compilation : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Date d'installation : %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" -msgstr "Installés par : %s" +msgstr "Installés par  : %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" -msgstr "Modifié par  : %s" +msgstr "Modifié par   : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " -msgstr "Résumé  : " +msgstr "Résumé   : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" -msgstr "URL : %s" +msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " -msgstr "Licence  : " +msgstr "Licence   : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " -msgstr "Description : " +msgstr "Description  : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "o" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "oui" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "non" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Est-ce correct [o/N] : " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -741,158 +772,160 @@ msgstr "" - "\n" - "Groupe : %s" + "Group: %s" +-msgstr "" +-"\n" +-"Groupe : %s" ++msgstr "\nGroupe : %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" -msgstr " Id du g : %s" +msgstr " ID du groupe : %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" -msgstr " Description : %s" +msgstr " Description : %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Langue : %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" -msgstr " Paquets mandataires :" +msgstr " Paquets obligatoires :" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Paquets par défaut :" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Paquets optionnels :" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Paquets conditionnels :" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paquet : %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Pas de dépendances pour ce paquet" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" -msgstr " dépendance : %s" +msgstr " dépendance  : %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Dépendance non satisfaite" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Correspondance depuis :" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" -msgstr "Licence  : %s" +msgstr "Licence  : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" -msgstr "Nom de fichier  : %s" +msgstr "Nom de fichier : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " -msgstr "Autre  :" +msgstr "Autre :" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 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" ++msgstr "Une erreur est survenue pendant le calcul de la taille totale des téléchargements" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" -msgstr "Taille totale : %s" +msgstr "Taille totale  : %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Taille totale des téléchargements : %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Taille d'installation : %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" - msgstr "" - "Une erreur est survenue pendant le calcul de la taille des données " - "installées" +-msgstr "" +-"Une erreur est survenue pendant le calcul de la taille des données " +-"installées" ++msgstr "Une erreur est survenue pendant le calcul de la taille des données installées" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Réinstallation " -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" -msgstr "Retour à la version précédente" +msgstr "Retour à la version précédente " -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Installation pour dépendances " -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Mise à jour pour dépendances " -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Suppression pour dépendances " -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Omis (problèmes de dépendances) " -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Non installé" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Indisponible" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paquet" +msgid_plural "Packages" @@ -46011,46 +47185,50 @@ index 4636b15..a80098f 100644 +msgstr[1] "Paquets" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Architecture" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Version" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Dépôt" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" -msgstr "Taille " +msgstr "Taille" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " remplacement de %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -903,57 +936,58 @@ msgstr "" - "Résumé de la transaction\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Résumé de la transaction\n" +-"%s\n" ++msgstr "\nRésumé de la transaction\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installation de %5.5s paquets\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Installation " @@ -46058,7 +47236,7 @@ index 4636b15..a80098f 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Mise à jour de %5.5s paquets\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Mettre à jour" @@ -46066,7 +47244,7 @@ index 4636b15..a80098f 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Suppression de %5.5s paquets\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Supprimer" @@ -46074,7 +47252,7 @@ index 4636b15..a80098f 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Réinstallation de %5.5s paquets\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Réinstallation" @@ -46082,333 +47260,336 @@ index 4636b15..a80098f 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Retour à une version antérieur de %5.5s paquets\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Retour à la version précédente" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Paquet en dépendance" +msgstr[1] "Paquets en dépendance" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" - msgstr "Supprimés " +-msgstr "Supprimés " ++msgstr "Supprimé " -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Dépendances supprimées " -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Dépendances installées " -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Dépendances mises à jour " -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" - msgstr "Remplacés " +-msgstr "Remplacés " ++msgstr "Remplacé " -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Échec" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "deux" -@@ -961,7 +995,7 @@ msgstr "deux" +@@ -961,571 +963,598 @@ msgstr "deux" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -969,370 +1003,422 @@ msgid "" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" "to exit.\n" - msgstr "" - "\n" +-msgstr "" +-"\n" -"Téléchargement courant annulé, demandez de nouveau l%sinterruption (crtl-c)%s dans %s%s%s secondes\n" -+"Téléchargement courant annulé, demandez de nouveau l'%sinterruption (crtl-c)%s dans %s%s%s secondes\n" - "pour quitter.\n" +-"pour quitter.\n" ++msgstr "\nTéléchargement courant annulé, demandez de nouveau l'%sinterruption (crtl-c)%s dans %s%s%s secondes\npour quitter.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "interruption par l'utilisateur" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Système" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" - msgstr "" - "Omission des transactions regroupées de %d à %d, puisqu'elles se superposent" +-msgstr "" +-"Omission des transactions regroupées de %d à %d, puisqu'elles se superposent" ++msgstr "Omission des transactions regroupées de %d à %d, puisqu'elles se superposent" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Pas de transaction" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Le ou les paquets ou identifiants de transaction fournis sont erronés" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Ligne de commande" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Identifiant utilisateur" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" -msgstr "Id" +msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Date et heure" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Action" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Modifié" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Aucun identifiant de transaction n'a été fourni" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "L'identifiant de transaction fourni est erroné" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "L'identifiant de transaction fourni est introuvable" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Plus d'un identifiant de transaction a été trouvé !" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Le paquet ou l'identifiant de transaction fourni sont absents" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Rétrogradé" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Plus ancien" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Plus récent" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" -msgstr "Identifiant de transaction :" +msgstr "ID de transaction :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" -msgstr "Temps de début :" +msgstr "Temps de début :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" -msgstr "Début de RPMDB :" +msgstr "Début de RPMDB :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u secondes)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minutes)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u heures)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u jours)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Temps de fin :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Fin de RPMDB :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" -msgstr "Utilisateur :" +msgstr "Utilisateur :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" -msgstr "Code retour :" +msgstr "Code retour :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Avorté" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Échecs :" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Échec :" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Réussi" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Ligne de commande :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Informations supplémentaires stockées : %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transaction effectuée avec :" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Paquets modifiés :" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Paquets ignorés :" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problèmes RPMDB :" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Sortie du scriplet :" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Erreurs :" @@ -46417,18 +47598,18 @@ index 4636b15..a80098f 100644 -msgstr "Installation " - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Installation déps." -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" -msgstr "Obsolète" -+msgstr "" ++msgstr "Rendre obsolète" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Supprimé" @@ -46441,302 +47622,317 @@ index 4636b15..a80098f 100644 -msgstr "Retour à la version précédente" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Mise à jour" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Heure" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Dernier jour" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Semaine dernière" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Deux dernières semaines" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Trois derniers mois" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Six derniers mois" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "L'année dernière" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Il y a plus d'un an" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Aucune transaction %s n'a été trouvée" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Identifiant de transaction :" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Informations additionnelles disponibles dans l'historique :" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s : aucune donnée supplémentaire trouvée avec ce nom" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Paquet  :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "État  :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Taille  :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Hôte de construction :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Date de compilation :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Empaqueteur  :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Vendeur  :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Licence  :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "URL  :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "source du RPM  :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Heure de commit  :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Committer  :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Raison  :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Depuis le dépôt  :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Installé par  :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Modifié par  :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installé" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" -msgstr "la mise à jour" +msgstr "utilisé" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "effacé" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "réinstallé" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "une rétrogradation" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" --msgstr "obsolète" -+msgstr "" + msgstr "obsolète" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "mis à jour" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "obsolète" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Le paquet %s.%s %s:%s-%s sera %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Lancement de la transaction de test" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 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." ++msgstr "--> Redémarrage de la résolution des dépendances avec les nouveaux changements." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Résolution des dépendances terminée" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Traitement de la dépendance : %s pour le paquet : %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Conservation du paquet : %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dépendance non résolue : %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paquet : %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1341,7 +1427,7 @@ msgstr "" - "\n" - " Requiert : %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Requiert : %s" ++msgstr "\n Requiert : %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1350,7 +1436,7 @@ msgstr "" - "\n" - " %s : %s (%s)" + " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s : %s (%s)" ++msgstr "\n %s : %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1359,7 +1445,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1368,88 +1454,88 @@ msgstr "" - " Non trouvé" +-msgstr "" +-"\n" +-" Non trouvé" ++msgstr "\n Non trouvé" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Mis à jour par" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Rétrogradé par" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Rendu obsolète par" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Disponible" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Traitement du conflit : %s entre en conflit avec %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de" - " patienter." +-msgstr "" +-"--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de" +-" patienter." ++msgstr "--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de patienter." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" +-msgstr "" -"--> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction." -+"---> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction." ++msgstr "---> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction." ++ ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Vérification" -#: ../utils.py:99 +#: ../utils.py:129 @@ -46765,7 +47961,7 @@ index 4636b15..a80098f 100644 msgstr "Tracé/Stoppé" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Inconnu" @@ -46807,36 +48003,47 @@ index 4636b15..a80098f 100644 msgid "" "\n" "\n" -@@ -1459,7 +1545,7 @@ msgstr "" - "\n" - "Sortie sur annulation par l'utilisateur" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Sortie sur annulation par l'utilisateur" ++msgstr "\n\nSortie sur annulation par l'utilisateur" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1469,7 +1555,7 @@ msgstr "" - "\n" - "Sortie suite à une redirection cassée" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Sortie suite à une redirection cassée" ++msgstr "\n\nSortie suite à une redirection cassée" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1480,7 +1566,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1488,36 +1574,36 @@ msgstr "" - "Une autre application verrouille actuellement l'utilisation de yum ; " - "fermeture en cours conformément à la configuration de exit_on_lock" +-msgstr "" +-"Une autre application verrouille actuellement l'utilisation de yum ; " +-"fermeture en cours conformément à la configuration de exit_on_lock" ++msgstr "Une autre application verrouille actuellement l'utilisation de yum ; fermeture en cours conformément à la configuration de exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -46859,8 +48066,9 @@ index 4636b15..a80098f 100644 -#: ../utils.py:346 ../yummain.py:194 +#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" - msgstr "" - " Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème" +-msgstr "" +-" Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème" ++msgstr " Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème" -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 @@ -46878,16 +48086,17 @@ index 4636b15..a80098f 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1525,7 +1611,7 @@ msgstr "" - "\n" - "Dépendances résolues" +-msgstr "" +-"\n" +-"Dépendances résolues" ++msgstr "\nDépendances résolues" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Terminé !" -@@ -1537,7 +1623,7 @@ msgstr " Usage minimal :\n" +@@ -1537,7 +1566,7 @@ msgstr " Usage minimal :\n" msgid "You need to be root to perform this command." msgstr "Vous devez être super-utilisateur pour lancer cette commande." @@ -46896,9 +48105,25 @@ index 4636b15..a80098f 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1567,53 +1653,53 @@ msgstr "" +@@ -1552,478 +1581,482 @@ msgid "" + "will install it for you.\n" "\n" - "Pour plus de renseignements, contactez le fournisseur de paquets de votre distribution.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Vous avez activé la vérification des paquets 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 paquets 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" +-"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 paquets de votre distribution.\n" ++msgstr "\nVous avez activé la vérification des paquets via clés GPG. C'est une bonne chose. \nCependant, vous n'avez aucune clé GPG publique installée. Vous devez télécharger\net installer les clés pour les paquets que vous souhaitez installer..\nVous pouvez le faire en lançant la commande :\n rpm --import public.gpg.key\n\n\nAlternativement, vous pouvez spécifier l'URL de la clé que vous souhaitez utiliser\npour un dépôt dans l'option 'gpgkey' dans une section du dépôt et yum\nl'installera pour vous.\n\nPour plus de renseignements, contactez le fournisseur de paquets de votre distribution.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -46962,9 +48187,12 @@ index 4636b15..a80098f 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1623,309 +1709,298 @@ msgstr "" - " Exécutez « yum repolist all » pour consulter la liste des dépôts installés.\n" - " Vous pouvez activer des dépôts avec la commande yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Aucun dépôt n'est activé.\n" +-" Exécutez « yum repolist all » pour consulter la liste des dépôts installés.\n" +-" Vous pouvez activer des dépôts avec la commande yum-config-manager --enable " ++msgstr "Aucun dépôt n'est activé.\n Exécutez « yum repolist all » pour consulter la liste des dépôts installés.\n Vous pouvez activer des dépôts avec la commande yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -46999,8 +48227,9 @@ index 4636b15..a80098f 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "Synchronise les paquets installés vers leurs versions les plus récentes" +-msgstr "" +-"Synchronise les paquets installés vers leurs versions les plus récentes" ++msgstr "Synchronise les paquets installés vers leurs versions les plus récentes" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -47105,14 +48334,16 @@ index 4636b15..a80098f 100644 -#: ../yumcommands.py:556 +#: ../yumcommands.py:955 msgid "Making cache files for all metadata files." - msgstr "" - "Création des fichiers de cache pour tous les fichiers de méta données." +-msgstr "" +-"Création des fichiers de cache pour tous les fichiers de méta données." ++msgstr "Création des fichiers de cache pour tous les fichiers de méta données." -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "Cela peut prendre du temps en fonction de la vitesse de cet ordinateur" +-msgstr "" +-"Cela peut prendre du temps en fonction de la vitesse de cet ordinateur" ++msgstr "Cela peut prendre du temps en fonction de la vitesse de cet ordinateur" -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -47199,137 +48430,137 @@ index 4636b15..a80098f 100644 msgstr "Affiche les dépôts logiciels configurés" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "activé" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "désactivé" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " -msgstr "Id du dépôt : " +msgstr "Id du dépôt : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " -msgstr "Nom du dépôt : " +msgstr "Nom du dépôt : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " -msgstr "État du dépôt : " +msgstr "État du dépôt : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " -msgstr "Révision du dépôt :" +msgstr "Révision du dépôt  : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " -msgstr "Tags du dépôt :" +msgstr "Tags du dépôt : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " -msgstr "Repo-distro-tags : " +msgstr "Repo-distro-tags  : " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " -msgstr "Mise à jour du dépôt :" +msgstr "Mise à jour du dépôt : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " -msgstr "Paquets du dépôt  : " +msgstr "Paquets du dépôt  : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " -msgstr "Taille du dépôt  : " +msgstr "Taille du dépôt   : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " -msgstr "Baseurl du dépôt : " +msgstr "Baseurl du dépôt  : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " -msgstr "Méta-lien du dépôt :" +msgstr "Méta-lien du dépôt  : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " -msgstr " Mis à jour : " +msgstr " Mis à jour : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " -msgstr "Miroirs du dépôt :" +msgstr "Miroirs du dépôt  : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Jamais (dernier : %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Instant (dernier : %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s secondes (en date du : %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " -msgstr "Expiration du dépôt : " +msgstr "Expiration du dépôt : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " -msgstr "Exclus du dépôt :" +msgstr "Exclus du dépôt  : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " -msgstr "Inclus au dépôt :" +msgstr "Inclus au dépôt  : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " -msgstr "Exclus du dépôt : " +msgstr "Exclus du dépôt  : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Nom du dépôt : " @@ -47337,221 +48568,225 @@ index 4636b15..a80098f 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "id du dépôt" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "statut" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "nom du dépôt" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Affiche un message d'aide à l'utilisation" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Aucune aide disponible pour %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1935,7 +2010,7 @@ msgstr "" - "\n" - "alias : " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"alias : " ++msgstr "\n\nalias : " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1945,85 +2020,125 @@ msgstr "" - "\n" - "alias : " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias : " ++msgstr "\n\nalias : " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Configuration du processus de réinstallation" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "Réinstaller un paquet" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Configuration du processus de retour à une version antérieure" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "Restaure un paquet à une version antérieure" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Affiche une version de la machine ou des dépôts disponibles" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "Groupes de version de yum :" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" -msgstr "Groupe :" +msgstr " Groupe :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" -msgstr "Paquets :" +msgstr " Paquets :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" -msgstr "Installés :" +msgstr "Installés :" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" -msgstr "Groupe installé :" +msgstr "Groupes installés :" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Disponible :" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Groupes disponibles :" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Affiche ou utilise l'historique de transaction" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Transactions :" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Début  :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Fin  :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Nombre :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Sous-commande de l'historique invalide, utilisez : %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Vous n'avez pas accès à la base de données de l'historique." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Recherche des problèmes dans RPMDB" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "charge une transaction sauvegardée à partir d'un nom de fichier" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "Aucun fichier de sauvegarde de transaction spécifié." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "Chargement de la transaction à partir de %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transaction chargée à partir de %s avec %s membres" -@@ -2034,30 +2149,38 @@ msgstr "Transaction chargée à partir de %s avec %s membres" +@@ -2034,107 +2067,106 @@ msgstr "Transaction chargée à partir de %s avec %s membres" msgid " Yum checks failed: %s" msgstr " Échec du vérificateur de Yum : %s" -#: ../yummain.py:114 +-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:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+"Pas d'accès en lecture/écriture sur le répertoire courant, on se déblace " -+"dans /" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "Impossible de créer le fichier verrou, arrêt" -+ -+#: ../yummain.py:128 - 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..." ++msgstr "Pas d'accès en lecture/écriture sur le répertoire courant, on se déblace dans /" -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "Impossible de créer le fichier verrou, arrêt" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "Impossible de créer le fichier verrou, arrêt" + ++#: ../yummain.py:128 ++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..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -47562,301 +48797,306 @@ index 4636b15..a80098f 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" -+msgid "" -+"Your transaction was saved, rerun it with:\n" -+" yum load-transaction %s" - msgstr "" +-msgstr "" -"Votre transaction a été sauvegardée, relancez-là avec : yum load-transaction" -" %s" -+"Votre transaction a été enregistrée, relancez-la avec :\n" ++msgid "" ++"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" ++msgstr "Votre transaction a été enregistrée, relancez-la avec :\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2067,74 +2190,74 @@ msgstr "" - "\n" - "Sortie sur annulation par l'utilisateur." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Sortie sur annulation par l'utilisateur." ++msgstr "\n\nSortie sur annulation par l'utilisateur." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() sera supprimé dans une future version de Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Mise en place de l'ensemble des transactions avant configuration" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag invalide dans le fichier de configuration : %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Recherche dans le regroupement pour la dépendance : %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Membre : %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s converti pour installation" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Ajout du paquet %s en mode %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Suppression du paquet %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s requiert : %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s requiert %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Le prérequis a déjà été trouvé, on triche" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Le prérequis n'est pas un nom de paquet. Recherche de : %s " -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Fournisseur potentiel : %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, 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:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Mode pour le paquet qui fournit %s : %s" -@@ -2142,265 +2265,265 @@ msgstr "Mode pour le paquet qui fournit %s : %s" +@@ -2142,1067 +2174,1029 @@ msgstr "Mode pour le paquet qui fournit %s : %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Éssai de mise à jour de %s pour résoudre les dépendances" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Pas de chemin de mise à jour pour %s. Échec !" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO : le paquet %s requiert la suppression de %s" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." -msgstr "TSINFO : Obsolescence de %s avec %s pour résoudre les dépendances." +msgstr "TSINFO : obsolescence de %s avec %s pour résoudre les dépendances." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." -msgstr "TSINFO : Mise à jour de %s pour la résolution des dépendances." +msgstr "TSINFO : mise à jour de %s pour la résolution des dépendances." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, 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" ++msgstr "Impossible de trouver un chemin de mise à jour pour la dépendance de : %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Correspondance %s trouvée pour %s " #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s est dans les paquets fournis mais est déjà installé, suppression." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "ts contient une version plus récente du paquet %s susceptible de résoudre la" - " dépendance." +-msgstr "" +-"ts contient une version plus récente du paquet %s susceptible de résoudre la" +-" dépendance." ++msgstr "ts contient une version plus récente du paquet %s susceptible de résoudre la dépendance." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "Le paquet susceptible de résoudre la dépedence %s est déjà installé dans une" - " version plus récente." +-msgstr "" +-"Le paquet susceptible de résoudre la dépedence %s est déjà installé dans une" +-" version plus récente." ++msgstr "Le paquet susceptible de résoudre la dépedence %s est déjà installé dans une version plus récente." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s déjà dans ts, omission de celui-ci" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" -msgstr "TSINFO : Sélection de %s pour mise à jour de %s" +msgstr "TSINFO : sélection de %s pour mise à jour de %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" -msgstr "TSINFO : Sélection de %s pour installation de %s" +msgstr "TSINFO : sélection de %s pour installation de %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Succès - transaction vide" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Re-démarrage de la boucle" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Finalisation du processus de dépendance" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Succès - dépendances résolues" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Recherche des dépendances pour %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "recherche de %s comme prérequis de %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Lancement de compare_providers() pour %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "meilleure architecture dans l'objet paquet %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s rend obsolète %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" " Winner: %s" - msgstr "" - "architecture %s comparée à %s sur %s\n" +-msgstr "" +-"architecture %s comparée à %s sur %s\n" -" Gagnant : %s" -+" Vainqueur : %s" ++msgstr "architecture %s comparée à %s sur %s\n Vainqueur : %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "rpm source commun pour %s et %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "le paquet de base %s est installé pour %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "préfixe commun %s entre %s et %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "requiert au minimum : %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Vainqueur : %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Perdant (avec %d) : %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Meilleur ordre : %s" @@ -47876,9 +49116,10 @@ index 4636b15..a80098f 100644 +#: ../yum/__init__.py:533 #, 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" ++msgstr "Il manque le nom du dépôt %r dans la configuration, utilisation de l'identifiant" -#: ../yum/__init__.py:526 +#: ../yum/__init__.py:571 @@ -47991,9 +49232,10 @@ index 4636b15..a80098f 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2408,22 +2531,22 @@ msgstr "" - "Il reste des transactions non terminées. Vous devriez envisager de lancer de" - " yum-complete-transaction pour les terminer." +-msgstr "" +-"Il reste des transactions non terminées. Vous devriez envisager de lancer de" +-" yum-complete-transaction pour les terminer." ++msgstr "Il reste des transactions non terminées. Vous devriez envisager de lancer de yum-complete-transaction pour les terminer." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -48004,8 +49246,9 @@ index 4636b15..a80098f 100644 +#: ../yum/__init__.py:1125 #, python-format msgid "Protected multilib versions: %s != %s" - msgstr "" - "protection contre les différentes versions de bibliothèques : %s != %s" +-msgstr "" +-"protection contre les différentes versions de bibliothèques : %s != %s" ++msgstr "protection contre les différentes versions de bibliothèques : %s != %s" -#: ../yum/__init__.py:1096 +#: ../yum/__init__.py:1180 @@ -48018,9 +49261,10 @@ index 4636b15..a80098f 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2431,90 +2554,94 @@ msgstr "" - "\n" - "Paquets omis en raison de problèmes de dépendances :" +-msgstr "" +-"\n" +-"Paquets omis en raison de problèmes de dépendances :" ++msgstr "\nPaquets omis en raison de problèmes de dépendances :" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -48033,15 +49277,17 @@ index 4636b15..a80098f 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** %d problèmes RPMDB préexistants trouvés, la sortie de « yum check » est " - "la suivante :" +-msgstr "" +-"** %d problèmes RPMDB préexistants trouvés, la sortie de « yum check » est " +-"la suivante :" ++msgstr "** %d problèmes RPMDB préexistants trouvés, la sortie de « yum check » est la suivante :" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 msgid "Warning: RPMDB altered outside of yum." - msgstr "" - "Avertissement : RPMDB a été modifiée par une autre application que yum." +-msgstr "" +-"Avertissement : RPMDB a été modifiée par une autre application que yum." ++msgstr "Avertissement : RPMDB a été modifiée par une autre application que yum." -#: ../yum/__init__.py:1407 +#: ../yum/__init__.py:1493 @@ -48057,10 +49303,9 @@ index 4636b15..a80098f 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" +-msgstr "" -"Attention : scriptlet ou autres erreurs non fatales pendant la transaction." -+"Attention : scriptlet ou autres erreurs non fatales apparues pendant la " -+"transaction." ++msgstr "Attention : scriptlet ou autres erreurs non fatales apparues pendant la transaction." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -48082,7 +49327,7 @@ index 4636b15..a80098f 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s est censé être installé, mais ne l'est pas !" @@ -48093,24 +49338,22 @@ index 4636b15..a80098f 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s est censé être supprimé, mais ne l'est pas !" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Impossible de libérer le verrou %s : %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Impossible de libérer le verrou %s : %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Impossible de vérifier si le PID %s est actif" - +-#, 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:1789 +#: ../yum/__init__.py:1917 @@ -48120,40 +49363,55 @@ index 4636b15..a80098f 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Impossible de créer le verrou sur %s : %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Impossible de libérer le verrou %s : %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Impossible de vérifier si le PID %s est actif" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2523,42 +2650,31 @@ msgstr "" - "Le paquet ne correspond pas au téléchargement attendu. Suggestion : exécutez" - " yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Le paquet ne correspond pas au téléchargement attendu. Suggestion : exécutez" +-" yum --enablerepo=%s clean metadata" ++msgstr "Le paquet ne correspond pas au téléchargement attendu. Suggestion : exécutez yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Ne peut procéder à la vérification des sommes de contrôle" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Le paquet ne correspond pas à sa somme de contrôle" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "Le paquet ne correspond pas à la somme de contrôle mais le cache est activé " - "pour %s" +-msgstr "" +-"Le paquet ne correspond pas à la somme de contrôle mais le cache est activé " +-"pour %s" ++msgstr "Le paquet ne correspond pas à la somme de contrôle mais le cache est activé pour %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "utilisation de la copie locale de %s" @@ -48170,69 +49428,70 @@ index 4636b15..a80098f 100644 -" * nécessaire %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "L'en-tête est incomplet." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2566,62 +2682,64 @@ msgstr "" - "L'en-tête n'est pas dans le cache et le mode cache uniquement est activé. " - "Impossible de télécharger %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" ++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:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "La clé publique pour %s n'est pas installée" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problème à l'ouverture du paquet %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "La clé publique pour %s n'est pas de confiance" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Le paquet %s n'est pas signé" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Impossible de supprimer %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s supprimé" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Impossible de supprimer depuis %s le fichier %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "fichier de %s : %s supprimé" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d fichiers de %s supprimés" @@ -48242,28 +49501,29 @@ index 4636b15..a80098f 100644 +msgstr[1] "%d %s fichiers supprimés" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, 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:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, 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:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2629,56 +2747,58 @@ msgstr "" - "searchPackages() sera supprimé dans une future version de Yum." - " Utilisez searchGenerator() à la place. \n" +-msgstr "" +-"searchPackages() sera supprimé dans une future version de Yum." +-" Utilisez searchGenerator() à la place. \n" ++msgstr "searchPackages() sera supprimé dans une future version de Yum. Utilisez searchGenerator() à la place. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Recherche de %d paquets" @@ -48273,634 +49533,652 @@ index 4636b15..a80098f 100644 +msgstr[1] "Recherche de %d paquets" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "recherche du paquet %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "recherche dans les entrées de fichiers" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "recherche dans les entrées de correspondance" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Aucune donnée sur les groupes disponible pour les dépôts configurés" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Aucun groupe nommé %s n'existe" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "le paquet %s n'a pas été marqué dans le groupe %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Ajout du paquet %s pour le groupe %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Aucun paquet nommé %s n'est disponible pour installation" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Attention : le goupe %s ne contient aucun paquets." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." - msgstr "" -@@ -2687,66 +2807,67 @@ msgstr "" +-msgstr "" +-"Le groupe %s contient %u paquets conditionnels, qui sont susceptibles d'être" +-" installés." ++msgstr "Le groupe %s contient %u paquets conditionnels, qui sont susceptibles d'être installés." #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Impossible de trouver le tuple de paquet %s dans le regroupement" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Impossible de trouver le tuple de paquet %s dans RPMDB" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Version de drapeau invalide : %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Aucun paquet trouvé pour %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "L'objet paquet n'était pas une instance correcte d'objet paquet" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Rien de spécifié pour installation" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format 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" ++msgstr "Recherche de correspondance virtuelle ou de correspondance fichier pour %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Aucune correspondance pour l'argument : %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Le paquet %s est installé et n'est pas disponible" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Aucun paquet disponible pour installation" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paquet : %s - déjà dans le jeu de transaction" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Le paquet %s est rendu obsolète par %s qui est déjà installé" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2755,19 +2876,19 @@ msgstr "" - "Le paquet %s est rendu obsolète par %s, mais l'obsolescence n'affecte pas " - "les dépendances" + "requirements" +-msgstr "" +-"Le paquet %s est rendu obsolète par %s, mais l'obsolescence n'affecte pas " +-"les dépendances" ++msgstr "Le paquet %s est rendu obsolète par %s, mais l'obsolescence n'affecte pas les dépendances" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Le paquet %s est rendu obsolète par %s, tentative d'installation de %s à la " - "place" +-msgstr "" +-"Le paquet %s est rendu obsolète par %s, tentative d'installation de %s à la " +-"place" ++msgstr "Le paquet %s est rendu obsolète par %s, tentative d'installation de %s à la place" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Le paquet %s est déjà installé dans sa dernière version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" -@@ -2775,69 +2896,75 @@ msgstr "" - "jour." +-msgstr "" +-"Le paquet qui correspond à %s est déjà installé. Recherche d'une mise à " +-"jour." ++msgstr "Le paquet qui correspond à %s est déjà installé. Recherche d'une mise à jour." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Mise à jour complète" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "" - "Pas de mise à jour des paquets qui ont déjà été rendus obsolètes : %s.%s " - "%s:%s-%s" +-msgstr "" +-"Pas de mise à jour des paquets qui ont déjà été rendus obsolètes : %s.%s " +-"%s:%s-%s" ++msgstr "Pas de mise à jour des paquets qui ont déjà été rendus obsolètes : %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Aucun paquet correspondant à mettre à jour : %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paquet déjà rendu obsolète : %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Pas de mise à jour du paquet qui est obsolète : %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "Pas de mise à jour des paquets qui ont déjà été mis à jour : %s.%s %s:%s-%s" +-msgstr "" +-"Pas de mise à jour des paquets qui ont déjà été mis à jour : %s.%s %s:%s-%s" ++msgstr "Pas de mise à jour des paquets qui ont déjà été mis à jour : %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Aucun paquet sélectionné pour suppression" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Aucun paquet correspondant à désinstaller : %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Omission du noyau en cours d'exécution : %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Suppression de %s de la transaction" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Impossible d'ouvrir : %s. Omission." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Examen de %s : %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Impossible d'exécuter localinstall sur le deltarpm : %s. Omission." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2845,14 +2972,14 @@ msgstr "" - "Impossible d'ajouter le paquet %s à la transaction. Architecture " - "incompatible : %s" +-msgstr "" +-"Impossible d'ajouter le paquet %s à la transaction. Architecture " +-"incompatible : %s" ++msgstr "Impossible d'ajouter le paquet %s à la transaction. Architecture incompatible : %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Impossible d'installer le paquet %s. Il est rendu obsolète par le paquet %s " - "installé" +-msgstr "" +-"Impossible d'installer le paquet %s. Il est rendu obsolète par le paquet %s " +-"installé" ++msgstr "Impossible d'installer le paquet %s. Il est rendu obsolète par le paquet %s installé" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2861,7 +2988,7 @@ msgstr "" - "Le paquet %s n'est pas installé, il est impossible de le mettre à jour. " - "Lancez plutôt yum install pour l'installer." + "instead." +-msgstr "" +-"Le paquet %s n'est pas installé, il est impossible de le mettre à jour. " +-"Lancez plutôt yum install pour l'installer." ++msgstr "Le paquet %s n'est pas installé, il est impossible de le mettre à jour. Lancez plutôt yum install pour l'installer." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2870,139 +2997,148 @@ msgstr "" - "Le paquet %s.%s n'est pas installé, il ne peut pas être mis à jour. Utilisez" - " « yum install » pour l'installer." + " instead." +-msgstr "" +-"Le paquet %s.%s n'est pas installé, il ne peut pas être mis à jour. Utilisez" +-" « yum install » pour l'installer." ++msgstr "Le paquet %s.%s n'est pas installé, il ne peut pas être mis à jour. Utilisez « yum install » pour l'installer." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Exclusion de %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Sélection de %s pour installation " -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Sélection de %s pour mise à jour de %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s : ne met pas à jour le paquet installé." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Impossible d'ouvrir le fichier : %s. Omission." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Problème dans la réinstallation : aucun paquet correspondant à supprimer" +-msgstr "" +-"Problème dans la réinstallation : aucun paquet correspondant à supprimer" ++msgstr "Problème dans la réinstallation : aucun paquet correspondant à supprimer" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Problème dans la réinstallation : aucun paquet %s correspondant à installer" +-msgstr "" +-"Problème dans la réinstallation : aucun paquet %s correspondant à installer" ++msgstr "Problème dans la réinstallation : aucun paquet %s correspondant à installer" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Aucun paquet disponible pour retour à une version antérieure" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Le paquet %s autorise des installations multiples, omission" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Aucune correspondance pour le paquet disponible : %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Mise à jour uniquement disponible pour le paquet : %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Échec lors du lors du retour à la version précédente : %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Erreur lors de la mise à jour : %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Récupération de la clé à partir de %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Échec de la récupération de la clé GPG : " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "La signature de la clé GPG %s ne correspond pas à celle du dépôt : %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "Signature de clé GPG vérifiée avec un certificat d'autorité de clés." -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Clé GPG invalide depuis %s :%s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Échec d'analyse de la clé GPG : la clé n'a pas de valeur %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" Package : %s (%s)\n" -+" From : %s" - msgstr "" +-msgstr "" -"Importation de la clé %s 0x%s :\n" -" Utilisateur : %s\n" -" Paquet       : %s (%s)\n" -" À partir de : %s" -+"Importation de la clef %s 0x%s :\n" -+"ID utilisateur : « %s »\n" -+"Empreinte  : %s\n" -+"Paquet  : %s (%s)\n" -+"Provient de  : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" ++msgstr "Importation de la clef %s 0x%s :\nID utilisateur : « %s »\nEmpreinte  : %s\nPaquet  : %s (%s)\nProvient de  : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" From : %s" - msgstr "" +-msgstr "" -"Importation de la clé %s 0x%s :\n" -" Utilisateur : « %s »\n" -" À partir de : %s" -+"Importation de la clef %s 0x%s :\n" -+"ID utilisateur : « %s »\n" -+"Empreinte  : %s\n" -+"Provient de  : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" ++msgstr "Importation de la clef %s 0x%s :\nID utilisateur : « %s »\nEmpreinte  : %s\nProvient de  : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "La clé GPG %s (0x%s) est déjà installée" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "L'import de la clé à échoué (code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "La clé a été importée avec succès" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Toutes les clés n'ont pas été installées" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -3011,26 +3147,26 @@ msgstr "" - "Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes pour ce paquet.\n" - "Vérifiez que les URL des clés pour ce dépôt soient correctes." + "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 paquet.\n" +-"Vérifiez que les URL des clés pour ce dépôt soient correctes." ++msgstr "Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes pour ce paquet.\nVérifiez que les URL des clés pour ce dépôt soient correctes." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" - msgstr "" - "L'import de la ou des clés n'a pas résolu le problème, clés incorrectes ?" +-msgstr "" +-"L'import de la ou des clés n'a pas résolu le problème, clés incorrectes ?" ++msgstr "L'import de la ou des clés n'a pas résolu le problème, clés incorrectes ?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "La clé GPG %s (0x%s) est déjà importée" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "L'import de la clé à échoué" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Aucune clé n'a été installée pour le dépôt %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3039,170 +3175,195 @@ msgstr "" - "Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes.\n" - "Vérifiez que les URL des clés pour ce dépôt soient correctes." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes.\n" +-"Vérifiez que les URL des clés pour ce dépôt soient correctes." ++msgstr "Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes.\nVérifiez que les URL des clés pour ce dépôt soient correctes." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Impossible de trouver un miroir adapté." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Des erreurs ont été rencontrée durant le téléchargement des paquets." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Veuillez reporter cette erreur dans %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Erreurs de la transaction de test : " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Impossible de configurer cachedir : %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" - "Les dépendances ne sont pas résolues. Les transactions non résolues ne " - "seront pas sauvegardées." +-msgstr "" +-"Les dépendances ne sont pas résolues. Les transactions non résolues ne " +-"seront pas sauvegardées." ++msgstr "Les dépendances ne sont pas résolues. Les transactions non résolues ne seront pas sauvegardées." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Impossible de sauvegarder le fichier de transaction %s : %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Impossible de lire le fichier de transaction sauvegardé %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " - msgstr "" - "La version de rpmdb ne correspond pas à la version de la transaction " - "enregistrée," +-msgstr "" +-"La version de rpmdb ne correspond pas à la version de la transaction " +-"enregistrée," ++msgstr "La version de rpmdb ne correspond pas à la version de la transaction enregistrée," -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " ignoré, comme spécifié." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " arrêt." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "impossible de trouver de tsflags, ou alors ce n'est pas un entier." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "txmbr est dans un état inconnu : %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Impossible de trouver txmbr : %s dans l'état %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Impossible de trouver txmbr : %s depuis : %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," - msgstr "" - "Des composants ou relations de la transactions sont manquant, ou la " - "transaction a été modifiée," +-msgstr "" +-"Des composants ou relations de la transactions sont manquant, ou la " +-"transaction a été modifiée," ++msgstr "Des composants ou relations de la transactions sont manquant, ou la transaction a été modifiée," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" - msgstr "" - " ignoré, comme spécifié. Vous devez résoudre les dépendances à nouveau !" - +-msgstr "" +-" ignoré, comme spécifié. Vous devez résoudre les dépendances à nouveau !" ++msgstr " ignoré, comme spécifié. Vous devez résoudre les dépendances à nouveau !" ++ +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s a déjà été consulté et ne peut donc pas être supprimé." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Examination des dépendances inverses de %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "" -+"%s a %s en tant que dépendance inverse qui a été installé par l'utilisateur." ++msgstr "%s a %s en tant que dépendance inverse qui a été installé par l'utilisateur." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s n'a pas de dépendances inverses installées par l'utilisateur." -+ + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 +#: ../yum/plugins.py:212 @@ -48930,15 +50208,17 @@ index 4636b15..a80098f 100644 +#: ../yum/plugins.py:281 #, 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" ++msgstr "Le module complémentaire « %s » ne spécifie pas la version de l'API requise" -#: ../yum/plugins.py:283 +#: ../yum/plugins.py:286 #, 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." ++msgstr "Le module complémentaire « %s » requiert l'API %s. L'API supportée est %s." -#: ../yum/plugins.py:316 +#: ../yum/plugins.py:319 @@ -48950,9 +50230,10 @@ index 4636b15..a80098f 100644 +#: ../yum/plugins.py:326 #, 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" +-msgstr "" +-"Au moins deux modules complémentaires avec le même nom « %s » existent dans " +-"le chemin de recherche des modules complémentaires" ++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:343 +#: ../yum/plugins.py:346 @@ -48966,9 +50247,10 @@ index 4636b15..a80098f 100644 +#: ../yum/plugins.py:349 #, 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" ++msgstr "Impossible de trouver le fichier de configuration pour le module complémentaire %s" -#: ../yum/plugins.py:508 +#: ../yum/plugins.py:553 @@ -49002,29 +50284,48 @@ index 4636b15..a80098f 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s fournit %s mais est introuvable" -@@ -3211,6 +3372,17 @@ msgstr "%s fournit %s mais est introuvable" +@@ -3211,6 +3205,19 @@ msgstr "%s fournit %s mais est introuvable" msgid "Repackaging" msgstr "Réempaquetage" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Vérification : %u/%u : %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Espace disque insuffisant dans le dossier de téléchargement %s\n" -+" * libre %s\n" -+" * nécessaire %s" ++msgstr "Espace disque insuffisant dans le dossier de téléchargement %s\n * libre %s\n * nécessaire %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3223,9 +3230,7 @@ msgstr "Échec du contrôle MD5 pour le RPM %s" + + #: ../rpmUtils/oldUtils.py:151 + 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:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3241,5 +3246,3 @@ msgstr "En-tête endommagée %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Erreur d'ouverture du rpm %s - erreur %s" +- +- diff --git a/po/gu.po b/po/gu.po -index e9ad955..5b9fed2 100644 +index e9ad955..a538f23 100644 --- a/po/gu.po +++ b/po/gu.po -@@ -2,14 +2,15 @@ +@@ -2,875 +2,899 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -49034,22 +50335,24 @@ index e9ad955..5b9fed2 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Gujarati (http://www.transifex.net/projects/p/yum/team/gu/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Gujarati (http://www.transifex.net/projects/p/yum/team/gu/)\n" ++"Language-Team: Gujarati (http://www.transifex.net/projects/p/yum/language/gu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: gu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "સુધારી રહ્યા છે" @@ -49060,31 +50363,31 @@ index e9ad955..5b9fed2 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "સ્થાપિત કરી રહ્યા છે" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "અપ્રચલિત થયેલ" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "સુધારેલ" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "દૂર કરેલ" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "સ્થાપિત થયેલ" @@ -49111,7 +50414,7 @@ index e9ad955..5b9fed2 100644 msgstr "દૂર કરેલ: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "દૂર કરી રહ્યા છે" @@ -49121,69 +50424,69 @@ index e9ad955..5b9fed2 100644 msgstr "સાફ કરો" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "આદેશ \"%s\" પહેલેથી જ વ્યાખ્યાયિત થયેલ છે" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "રિપોઝીટરીઓને સુયોજિત કરી રહ્યા છીએ" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "સ્થાનિય ફાઇલોમાંથી રિપોઝીટરી મેટાડેટાને વાંચી રહ્યા છે" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "રૂપરેખાંકન ભૂલ: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "વિકલ્પો ભૂલ: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " સ્થાપિત થયેલ: %s-%s પર %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "તમારે અમુક આદેશને આપવાની જરૂર છે" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "આવો આદેશ નથી: %s. મહેરબાની કરીને %s --help વાપરો" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "ડિસ્ક જરૂરિયાતો:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -49194,100 +50497,101 @@ index e9ad955..5b9fed2 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,292 +143,315 @@ msgstr "" - "ભૂલ સારાંશ\n" - "-------------\n" +-msgstr "" +-"ભૂલ સારાંશ\n" +-"-------------\n" ++msgstr "ભૂલ સારાંશ\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "વપરાશકર્તા આદેશ પર બહાર નીકળી રહ્યા છે" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "પેકેજોને ડાઉનલોડ કરી રહ્યા છે:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "પેકેજોને ડાઉનલોડ કરતી વખતે ભૂલ:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM ને સુધારવાની જરૂર છે" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "મહેરબાની કરીને %s માં આ ભૂલનો અહેવાલ કરો" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "પેકેજ(ઓ) %s%s%s ઉપલબ્ધ છે, પરંતુ સ્થાપિત થયેલ છે." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "પેકેજ %s%s%s ઉપલબ્ધ નથી." @@ -49295,7 +50599,7 @@ index e9ad955..5b9fed2 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "સ્થાપિત કરવા માટે પેકેજ (ઓ)" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -49304,13 +50608,13 @@ index e9ad955..5b9fed2 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "કંઇ કરવાનુ નથી" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "સુધારવા માટે %d પેકેજો ચિહ્નિત થયેલ છે" @@ -49320,12 +50624,12 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "સુધારવા માટે પેકેજો ચિહ્નિત થયેલ નથી" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -49335,12 +50639,12 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "દૂર કરવા માટે %d પેકેજો ચિહ્નિત થયેવ છે" @@ -49350,14 +50654,14 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "દૂર કરવા માટે પેકેજો ચિહ્નિત થયેલ નથી" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -49365,13 +50669,13 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (%s માંથી)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "સ્થાપિત થયેલ પેકેજ %s%s%s%s ઉપલબ્ધ નથી." @@ -49379,7 +50683,7 @@ index e9ad955..5b9fed2 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "પુન:સ્થાપિત કરવા માટે પેકેજ (ઓ)" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -49387,151 +50691,151 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "પેકેજો પૂરા પાડેલ નથી" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "સ્થાપિત કરવા માટે પેકેજ (ઓ)" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "ચેતવણી: તેની માટે બંધબેસતુ મળ્યુ નથી: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "%s માટે પેકેજ મળ્યુ નથી" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "બધુ જ સાફ કરી રહ્યા છે" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "હેડરો સાફ કરી રહ્યા છે" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "પેકેજો સાફ કરી રહ્યા છે" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "xml મેટાડેટા સાફ કરી રહ્યા છે" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "ડેટાબેઝ કેશ સાફ કરી રહ્યા છે" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "પ્લગઇનને સાફ કરી રહ્યા છે" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "સ્થાપિત થયેલ જૂથો:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "ઉપલબ્ધ જૂથો:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "ચેતવણી: જૂથ %s અસ્તિત્વ ધરાવતુ નથી." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "સ્થાપિત અથવા સુધારવા ઉપલબ્ધ કોઇપણ સૂચિત થયેલ જૂથમાં પેકેજો નથી" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "સ્થાપિત કરવા માટે %d પેકેજ(ઓ)" @@ -49541,18 +50845,18 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "જૂથોમાંથી દૂર કરવા માટે પેકેજો નથી" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "દૂર કરવા માટે %d પેકેજ(ઓ)" @@ -49562,611 +50866,618 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "પેકેજ %s પહેલેથી જ સ્થાપિત થયેલ છે, છોડી રહ્યા છે" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "પ્લગઇન વિકલ્પો" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "આદેશ વાક્ય ભૂલ: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -436,285 +462,289 @@ msgstr "" "\n" - "%s: %s વિકલ્પને દલીલની જરૂર છે" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s વિકલ્પને દલીલની જરૂર છે" ++msgstr "\n\n%s: %s વિકલ્પને દલીલની જરૂર છે" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "રૂપરેખાંકન ફાઇલ સ્થાન" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "ડિબગીંગ આઉટપુટ લેવલ" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "ભૂલ આઉટપુટ લેવલ" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "rpm માટે ડિબગીંગ આઉટપુટ લેવલ" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "બધા પ્રશ્ર્નો માટે જવાબ હાં" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "Yum આવૃત્તિ બતાવો અને બહાર નીકળો" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "સ્થાપન રુટ સુયોજિત કરો" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "એક અથવા વધારે રિપોઝીટરીઓને સક્રિય કરો (વાઇલ્ડકાર્ડને પરવાનગી આપેલ છે)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "એક અથવા વધારે રિપોઝીટરીઓને નિષ્ક્રિય કરો (વાઇલ્ડકાર્ડને પરવાનગી આપેલ છે)" +-msgstr "" +-"એક અથવા વધારે રિપોઝીટરીઓને નિષ્ક્રિય કરો (વાઇલ્ડકાર્ડને પરવાનગી આપેલ છે)" ++msgstr "એક અથવા વધારે રિપોઝીટરીઓને નિષ્ક્રિય કરો (વાઇલ્ડકાર્ડને પરવાનગી આપેલ છે)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "Yum પ્લગઇનને નિષ્ક્રિય કરો" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "નામ પ્રમાણે પ્લગઇનને નિષ્ક્રિય કરો" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "નામ પ્રમાણે પ્લગઇનને સક્રિય કરો" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "જાન્યુઆરી" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "ફેબ્રુઆરી" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "માર્ચ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "એપ્રિલ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "મે" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "જુન" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "જુલાઇ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "ઑગસ્ટ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "સપ્ટેમ્બર" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "ઑક્ટોમ્બર" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "નવેમ્બર" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "ડિસેમ્બર" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "બીજા મિરર માટે પ્રયત્ન કરી રહ્યા છે." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "નામ : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "આવૃત્તિ : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "માપ : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "સારાંશ : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "લાઇસન્સ : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "વર્ણન : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "હાં" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "નાં" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "શું આ બરાબર છે [y/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -723,154 +753,156 @@ msgstr "" - "\n" - "જૂથ: %s" + "Group: %s" +-msgstr "" +-"\n" +-"જૂથ: %s" ++msgstr "\nજૂથ: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " જૂથ-Id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " વર્ણન: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " ફરજિયાત પેકેજો:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " મૂળભૂત પેકેજો:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " વૈકલ્પિક પેકેજો:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " શરતી પેકેજો:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "પેકેજ: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "લાઇસન્સ : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "ફાઇલનામ : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "બીજા : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "કુલ માપ: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "કુલ ડાઉનલોડ માપ: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "સ્થાપિત થયેલ માપ: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "પુન:સ્થાપિત કરી રહ્યા છે" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "સ્થાપિત થયેલ નથી" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "પેકેજ" +msgid_plural "Packages" -+msgstr[0] "પેકેજ" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "પેકેજ" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "આવૃત્તિ" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "રિપોઝીટરી" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "માપ" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -878,57 +910,58 @@ msgid "" +@@ -878,57 +902,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" @@ -50174,329 +51485,329 @@ index e9ad955..5b9fed2 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "પુન:સ્થાપિત કરો" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "દૂર કરેલ" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "નિષ્ફળ" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "બે" -@@ -936,7 +969,7 @@ msgstr "બે" +@@ -936,7 +961,7 @@ msgstr "બે" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -944,371 +977,423 @@ msgid "" +@@ -944,541 +969,590 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "કુલ" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "સિસ્ટમ" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "તારીખ અને સમય" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "ક્રિયા (ઓ)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "વપરાશકર્તા :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "નિષ્ફળતા:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "સફળતા" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "આદેશ વાક્ય :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb સમસ્યાઓ:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "ભૂલો:" @@ -50505,17 +51816,17 @@ index e9ad955..5b9fed2 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "ભૂંસી નાખો" @@ -50528,224 +51839,224 @@ index e9ad955..5b9fed2 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "સુધારવું" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "સમય" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "છેલ્લો દિવસ" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "છેલ્લુ અઠવાડિયું" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "છેલ્લા 2 અઠવાડિયાઓ" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "છેલ્લા 3 મહિનાઓ" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "છેલ્લા 6 મહિનાઓ" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "છેલ્લુ વર્ષ" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "ઉપલબ્ધ વધારાની ઇતિહાસ જાણકારી:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: આ નામ પ્રમાણે વધારાની માહિતી મળી નથી" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "સ્થાપિત થયેલ" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "ભૂંસી નાખેલ" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "પુન:સ્થાપિત થયેલ" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "સુધારેલ" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "અપ્રચલિત થયેલ" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> પેકેજને રાખી રહ્યા છે: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "પેકેજ: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -50753,70 +52064,82 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1317,7 +1402,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1326,7 +1411,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1335,99 +1420,99 @@ msgstr "" - " મળ્યુ નથી" +-msgstr "" +-"\n" +-" મળ્યુ નથી" ++msgstr "\n મળ્યુ નથી" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "ઉપલબ્ધ" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "ચાલી રહ્યુ છે" @@ -50842,7 +52165,7 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "અજ્ઞાત" @@ -50896,9 +52219,13 @@ index e9ad955..5b9fed2 100644 #, python-format msgid "" "\n" -@@ -1438,47 +1523,47 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -50953,7 +52280,7 @@ index e9ad955..5b9fed2 100644 msgid "Complete!" msgstr "સમાપ્ત!" -@@ -1490,7 +1575,7 @@ msgstr "" +@@ -1490,7 +1564,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "આ આદેશને ચલાવવા માટે તમારે રુટમાં હોવુ જરૂરી છે." @@ -50962,7 +52289,7 @@ index e9ad955..5b9fed2 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1507,451 +1592,480 @@ msgid "" +@@ -1507,451 +1581,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -51260,153 +52587,153 @@ index e9ad955..5b9fed2 100644 msgstr "રૂપરેખાંકિત થયેલ સોફ્ટવેર રિપોઝીટરીઓને દર્શાવો" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "સક્રિય" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "નિષ્ક્રિય" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "પરિસ્થિતિ" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "રિપોઝીટરી નામ" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "%s માટે ઉપલબ્ધ મદદ નથી" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -51414,7 +52741,7 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -51422,148 +52749,148 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "પેકેજને પુન:સ્થાપિત કરો" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum આવૃત્તિ જૂથો:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " જૂથ :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " પેકેજો:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "સ્થાપિત થયેલ:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "ઉપલબ્ધ:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "જૂથ-ઉપલબ્ધ:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "rpmdb માં સમસ્યાઓ માટે ચકાસો" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1962,100 +2076,106 @@ msgstr "" +@@ -1962,100 +2065,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -51608,226 +52935,226 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "સભ્ય: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "પેકેજ %s ને દૂર કરી રહ્યા છે" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2063,991 +2183,1028 @@ msgstr "" +@@ -2063,991 +2172,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "લુપ પુન:શરૂ કરી રહ્યા છે" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "%s માટે compare_providers() ચલાવી રહ્યા છે" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -51835,43 +53162,43 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "સામાન્ય sourcerpm %s અને %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " વિજેતા: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -52084,7 +53411,7 @@ index e9ad955..5b9fed2 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -52095,24 +53422,22 @@ index e9ad955..5b9fed2 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "તાળુ %s ને ખોલી શક્યા નહિં: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "તાળુ %s ને ખોલી શક્યા નહિં: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "ચકાસવાનું અસમર્થ જો PID %s સક્રિય છે" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "ચકાસવાનું અસમર્થ જો PID %s સક્રિય છે" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -52122,13 +53447,25 @@ index e9ad955..5b9fed2 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "તાળુ %s ને ખોલી શક્યા નહિં: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "ચકાસવાનું અસમર્થ જો PID %s સક્રિય છે" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -52136,23 +53473,23 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "%s ની સ્થાનિક નકલને વાપરી રહ્યા છે" @@ -52166,67 +53503,67 @@ index e9ad955..5b9fed2 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "હેડર પૂર્ણ નથી." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "%s માટે સાર્વજનિક કી સ્થાપિત થયેલ નથી" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "પેકેજ %s ને ખોલી રહ્યા હોય ત્યારે સમસ્યા" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "પેકેજ %s હસ્તાક્ષર થયેલ નથી" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "%s ને દૂર કરી શકાતુ નથી" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s દૂર થયેલ છે" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s ફાઇલો દૂર થયેલ છે" @@ -52236,26 +53573,26 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "%d પેકેજોને શોધી રહ્યા છે" @@ -52265,62 +53602,62 @@ index e9ad955..5b9fed2 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "પેકેજ %s ને શોધી રહ્યા છે" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "રૂપરેખાંકિત થયેલ રિપોઝીટરીઓ માટે ઉપલબ્ધ જૂથ માહિતી નથી" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "નામ થયેલ જૂથ %s અસ્તિત્વ ધરાવતુ નથી" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "જૂથ %s માંથી પેકેજ %s ને ઉમેરી રહ્યા છે" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "સ્થાપિત કરવા માટે નામ થયેલ પેકેજ %s ઉપલબ્ધ નથી" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -52328,79 +53665,79 @@ index e9ad955..5b9fed2 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "%s માટે પેકેજ મળ્યુ નથી" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "સ્થાપિત કરવા માટે કઇ જ સ્પષ્ટ થયેલ નથી" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "પેકેજ %s સ્થાપિત થયેલ છે અને ઉપલબ્ધ નથી" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "સ્થાપિત કરવા માટે પેકેજ (ઓ) ઉપલબ્ધ નથી" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -52408,118 +53745,118 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "બધુ જ સુધારી રહ્યા છે" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "પેકેજ પહેલેથી જ અપ્રચલિત થયેલ છે: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "પેકેજને સુધારી રહ્યા નથી કે જે અપ્રચલિત થયેલ છે: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "પેકેજને સુધારી રહ્યા નથી કે જે પહેલેથી જ સુધારેલ છે: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "%s નું પરિક્ષણ કરી રહ્યા છે: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -52527,7 +53864,7 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -52535,118 +53872,118 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: સ્થાપિત પેકેજોને સુધારાતુ નથી." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "ઉપલબ્ધ પેકેજ માટે બંધબેસતુ નથી: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "%s માંથી અયોગ્ય GPG કી: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -52660,7 +53997,7 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -52672,29 +54009,29 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -52702,29 +54039,29 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -52732,117 +54069,117 @@ index e9ad955..5b9fed2 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "cachedir ને સુયોજિત કરી શક્યા નહિં: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -52942,10 +54279,15 @@ index e9ad955..5b9fed2 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3056,6 +3213,14 @@ msgstr "" +@@ -3056,6 +3203,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -52957,11 +54299,17 @@ index e9ad955..5b9fed2 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3084,5 +3244,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/hi.po b/po/hi.po -index 988a7a5..4842245 100644 +index 988a7a5..6d01ec5 100644 --- a/po/hi.po +++ b/po/hi.po -@@ -2,13 +2,14 @@ +@@ -2,427 +2,453 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -52969,22 +54317,24 @@ index 988a7a5..4842245 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Hindi (http://www.transifex.net/projects/p/yum/team/hi/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Hindi (http://www.transifex.net/projects/p/yum/team/hi/)\n" ++"Language-Team: Hindi (http://www.transifex.net/projects/p/yum/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,413 +17,438 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -52995,31 +54345,31 @@ index 988a7a5..4842245 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -53046,7 +54396,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -53056,69 +54406,69 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -53129,98 +54479,98 @@ index 988a7a5..4842245 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -53228,7 +54578,7 @@ index 988a7a5..4842245 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -53237,13 +54587,13 @@ index 988a7a5..4842245 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -53253,12 +54603,12 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -53268,12 +54618,12 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -53283,14 +54633,14 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -53298,13 +54648,13 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -53312,7 +54662,7 @@ index 988a7a5..4842245 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -53320,151 +54670,151 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -53474,18 +54824,18 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -53495,37 +54845,37 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -53534,353 +54884,353 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -53888,157 +55238,157 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -54046,33 +55396,33 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -54083,77 +55433,77 @@ index 988a7a5..4842245 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -54162,271 +55512,271 @@ index 988a7a5..4842245 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +968,536 @@ msgid "" +@@ -935,484 +968,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -54435,17 +55785,17 @@ index 988a7a5..4842245 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -54458,224 +55808,224 @@ index 988a7a5..4842245 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -54683,7 +56033,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -54691,7 +56041,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -54699,7 +56049,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -54707,43 +56057,49 @@ index 988a7a5..4842245 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -54769,7 +56125,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -54823,7 +56179,7 @@ index 988a7a5..4842245 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1505,47 @@ msgid "" +@@ -1420,47 +1511,47 @@ msgid "" "%s" msgstr "" @@ -54880,7 +56236,7 @@ index 988a7a5..4842245 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1557,7 @@ msgstr "" +@@ -1472,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -54889,7 +56245,7 @@ index 988a7a5..4842245 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1574,480 @@ msgid "" +@@ -1489,451 +1580,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -55059,14 +56415,14 @@ index 988a7a5..4842245 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -55186,153 +56542,153 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -55340,7 +56696,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -55348,148 +56704,148 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2058,106 @@ msgstr "" +@@ -1944,100 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -55534,226 +56890,226 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2165,1028 @@ msgstr "" +@@ -2045,991 +2171,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -55761,43 +57117,43 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -56010,7 +57366,7 @@ index 988a7a5..4842245 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -56021,40 +57377,46 @@ index 988a7a5..4842245 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -56062,23 +57424,23 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -56092,67 +57454,67 @@ index 988a7a5..4842245 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -56162,26 +57524,26 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -56191,62 +57553,62 @@ index 988a7a5..4842245 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -56254,79 +57616,79 @@ index 988a7a5..4842245 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -56334,118 +57696,118 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -56453,7 +57815,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -56461,118 +57823,118 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -56586,7 +57948,7 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -56598,29 +57960,29 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -56628,29 +57990,29 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -56658,117 +58020,117 @@ index 988a7a5..4842245 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -56868,10 +58230,15 @@ index 988a7a5..4842245 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3195,14 @@ msgstr "" +@@ -3038,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -56883,11 +58250,17 @@ index 988a7a5..4842245 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3243,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/hu.po b/po/hu.po -index db7c07f..1041090 100644 +index db7c07f..f3b4eb7 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2,14 +2,15 @@ +@@ -2,944 +2,958 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -56897,22 +58270,24 @@ index db7c07f..1041090 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Hungarian (http://www.transifex.net/projects/p/yum/team/hu/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Hungarian (http://www.transifex.net/projects/p/yum/team/hu/)\n" ++"Language-Team: Hungarian (http://www.transifex.net/projects/p/yum/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,123 +18,126 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Frissítés" @@ -56923,31 +58298,31 @@ index db7c07f..1041090 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Telepítés" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Elévült" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Frissítve" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Törölve" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Telepítve" @@ -56974,7 +58349,7 @@ index db7c07f..1041090 100644 msgstr "Eltávolítva: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Eltávolítás" @@ -56984,178 +58359,180 @@ index db7c07f..1041090 100644 msgstr "Tisztítás" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "A(z) \"%s\" nevű parancs már létezik" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Tárolók beállítása" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Tárolók metaadatainak beolvasása helyi fájlokból" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Beállítási hiba: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Opció hiba: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Telepítve : %s-%s at %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Létrehozva: %s at %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Hozzáadva: %s at %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Egy parancs megadása szükségeltetik" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Nincs ilyen parancs: %s. Kérjük használja a következőt: %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Szükséges hely:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" +-" Legalább %dMB-tal több helyre van szükség az alábbi fájlrendszeren: %s\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" +msgstr[0] "" -+" Legalább %dMB-tal több helyre van szükség az alábbi fájlrendszeren: %s\n" -+msgstr[1] "" - " Legalább %dMB-tal több helyre van szükség az alábbi fájlrendszeren: %s\n" ++msgstr[1] " Legalább %dMB-tal több helyre van szükség az alábbi fájlrendszeren: %s\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -141,61 +145,61 @@ msgstr "" - "Hiba összegzés\n" - "-------------\n" +-msgstr "" +-"Hiba összegzés\n" +-"-------------\n" ++msgstr "Hiba összegzés\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "A tranzakciót megpróbáltuk végrehajtani, de nincs semmi tennivaló. Kilépünk." +-msgstr "" +-"A tranzakciót megpróbáltuk végrehajtani, de nincs semmi tennivaló. Kilépünk." ++msgstr "A tranzakciót megpróbáltuk végrehajtani, de nincs semmi tennivaló. Kilépünk." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Felhasználói parancs miatt kilépés." -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Csomagok letöltése:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Hiba ezen csomagok letöltésekor:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Tranzakció-ellenőrzés futtatása" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "HIBA frissíteni kell az rpmet, hogy kezeljük:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "HIBA a tranzakció ellenőrzés- és függőségfeloldásnál:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM frissítésére van szükség" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Kérem jelentse ezt a hibát a következőben: %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Tranzakció teszt futtatása" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Tranzakció hibaellenőrzése:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "A Tranzakció teszt sikeres" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Tranzakció futtatása" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -203,233 +207,262 @@ msgstr "" - "Felügyelet nélküli futás közben kulcsok nem importálhatóak.\n" - "Használjuk az \"-y\" kapcsolót a felülbíráláshoz." +-msgstr "" +-"Felügyelet nélküli futás közben kulcsok nem importálhatóak.\n" +-"Használjuk az \"-y\" kapcsolót a felülbíráláshoz." ++msgstr "Felügyelet nélküli futás közben kulcsok nem importálhatóak.\nHasználjuk az \"-y\" kapcsolót a felülbíráláshoz." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "* Lehet, hogy erre gondolt:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "A(z) %s%s%s elérhető, de nincs telepítve." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Nincs ilyen csomag: %s%s%s." @@ -57163,7 +58540,7 @@ index db7c07f..1041090 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Telepítendő csomagok" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -57172,13 +58549,13 @@ index db7c07f..1041090 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nincs tennivaló" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d csomag kijelölve frissítésre" @@ -57188,12 +58565,12 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Nincs csomag kijelölve frissítésre" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d csomag van kijelölve Disztribúció Szinkronizáláshoz" @@ -57203,12 +58580,12 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Nincs csomag kijelölve Disztribúció Szinkronizáláshoz" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d csomag van kijelölve eltávolításra" @@ -57218,14 +58595,14 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Nincs csomag kijelölve eltávolításra" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Visszaállítandó csomagok" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -57233,13 +58610,13 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "(ebből: %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "A következő telepített csomag nem elérhető: %s%s%s%s" @@ -57247,7 +58624,7 @@ index db7c07f..1041090 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Újratelepítendő csomagok" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -57255,157 +58632,154 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Nem találhatóak csomagok" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Telepítendő csomagok" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "N/S Megegyezett: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" A névből és a leírásból csak %s egyezik ezzel: %s, használja a \"search " -+"all\" parancsot bárki kereséséhez." +-msgstr "" ++msgstr " A névből és a leírásból csak %s egyezik ezzel: %s, használja a \"search all\" parancsot bárki kereséséhez." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" A teljes névből és leírásból csak %s egyezik ezzel: %s, használja a " -+"\"search all\" parancsot bárki kereséséhez." +-msgstr "" ++msgstr " A teljes névből és leírásból csak %s egyezik ezzel: %s, használja a \"search all\" parancsot bárki kereséséhez." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Találat: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" -+" A névből és a leírásból többnyire %s egyezik meg ezzel: %s, használja a " -+"\"search all\" parancsot bárki kereséséhez." +-msgstr "" ++msgstr " A névből és a leírásból többnyire %s egyezik meg ezzel: %s, használja a \"search all\" parancsot bárki kereséséhez." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Figyelem: Nincs találat a következőnél: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Nincsenek találatok" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nem találhatóak csomagok a következőre: %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Tárolók tisztítása" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Minden tisztítása" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Fejlécek tisztítása" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Csomagok tisztítása" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "xml metaadat tisztítása" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Adatbázis-gyorsítótár tisztítása" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Elévülési gyorsítótár tisztítása" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Gyorsítótárazott rpmdb adatok tisztítása" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Bővítmények tisztítása" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Figyelem: Egy csoport sem azonos a következővel: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Telepített csoportok:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Telepített nyelvi csoportok:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Elérhető csoportok:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Elérhető nyelvi csoportok:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Kész" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Figyelem: Az alábbi csoport nem létezik: %s" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "Nincs telepítendő vagy frissítendő csomag a kiválasztott csoportokból" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Telepítendő csomag" @@ -57415,18 +58789,18 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Nincs ilyen csoport: %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Nincs szükség csomag eltávolítására csoportokból" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Eltávolítandó csomag" @@ -57436,604 +58810,617 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "A(z) %s nevű csomag már telepítve van, ezért továbblépünk." -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Megválunk a következőtől: pkg %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Nincs más %s telepítve, ezért hozzáadjuk a listához." -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Bővítmény beállítások" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Parancssori hiba a következőben: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -440,289 +473,293 @@ msgstr "" "\n" - "%s: %s opciónak szüksége van egy argumentumra" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s opciónak szüksége van egy argumentumra" ++msgstr "\n\n%s: %s opciónak szüksége van egy argumentumra" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--Szín egyikét veszi fel: auto, mindig, soha" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "A(z) --instalroot -nak abszolút elérési útnak kell lennie: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "ezen segítség mutatása" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "a hibák figyelmen kívül hagyása" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" - msgstr "" - "futtatás a rendszer gyorsítótárából anélkül, hogy a csomagok vagy " - "tárolóinformációk frissítve lennének" +-msgstr "" +-"futtatás a rendszer gyorsítótárából anélkül, hogy a csomagok vagy " +-"tárolóinformációk frissítve lennének" ++msgstr "futtatás a rendszer gyorsítótárából anélkül, hogy a csomagok vagy tárolóinformációk frissítve lennének" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "konfigurációs fájl elérésí útja" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "leghosszabb várakozási idő meghatározása" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "a hibakeresés szintje" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "ismétlődések mutatása a tárolókban és a keresési parancsokban" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "hiba kimeneti szintje" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "rpm hibakereső szint" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "csendes működés" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "visszajelzés működés közben" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "igennel válaszol minden felmerülő kérdésre" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "Yum verziójának mutatása és kilépés" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "telepítési root beállítása" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "egy vagy több tároló engedélyezése (helyettesítő karakterek megengedettek)" +-msgstr "" +-"egy vagy több tároló engedélyezése (helyettesítő karakterek megengedettek)" ++msgstr "egy vagy több tároló engedélyezése (helyettesítő karakterek megengedettek)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "egy vagy több tároló tiltása (helyettesítő karakterek megengedettek)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "csomagok kizárása név vagy glob szerint" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "kizárás letiltása alapkomponensre, tárolókra ill. bármire" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "elavult komponensek feldolgozásának engedélyezése" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "Yum bővítmények tiltása" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "gpg-aláírás ellenőrzés kihagyása" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "bővítmények tiltása név szerint" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "bővítmények engedélyezése név szerint" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "azon csomagok átugrása, melyeknek függőségi problémáik vannak" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "szín használatának befolyásolása" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "az alábbi érték beállítása a yum tároló és konfigurációs fájljaiban: " - "$releasever" +-msgstr "" +-"az alábbi érték beállítása a yum tároló és konfigurációs fájljaiban: " +-"$releasever" ++msgstr "az alábbi érték beállítása a yum tároló és konfigurációs fájljaiban: $releasever" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "tetszőleges konfiguráció- és tárolóbeállítások" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "jan." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "feb." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "márc." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "ápr." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "máj." -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "jún." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "júl." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "aug." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "szept." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "okt." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "nov." -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "dec." -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Próbálkozás másik tükörszerverről." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Név : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arch : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoch : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Verzió : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Kiadás : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Méret : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Tároló : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Tárolóból : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Beküldő : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Beküldési idő: %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Kiállítási idő : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Telepítési idő: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Telepítette: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Módosította : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Összegzés : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licenc : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Leírás : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "igen" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "nem" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Ez így jó? [y/N]" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -731,154 +768,156 @@ msgstr "" - "\n" - "Csoport: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Csoport: %s" ++msgstr "\nCsoport: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Csoport azonosító: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Leírás: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Nyelv: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Szükséges csomagok:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Alapértelmezett csomagok:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Opcionális csomagok:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Feltételes csomagok:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "csomag: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Ezen csomaghoz nincs függőség" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " függőség: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Teljesítetlen függőség" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Találat a következőtől:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licenc : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Fájlnév : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Egyéb : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Hiba történt a teljes letöltési méret számítása során" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Teljes méret: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Teljes letöltési méret: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Telepített méret: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Hiba történt a telepített méret számítása során" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Újratelepítés" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Visszaállítás" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Telepítés a függőségeknek" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Frissítés a függőségeknek" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Eltávolítás a függőségeknek" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Kihagyva (függőségi problémák)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Nem telepítve" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Nem elérhető" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Csomag" +msgid_plural "Packages" -+msgstr[0] "Csomag" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Csomag" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arch" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Verzió" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Tároló" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Méret" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " lecserélés %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -889,57 +928,58 @@ msgstr "" - "Tranzakció Összegzés\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Tranzakció Összegzés\n" +-"%s\n" ++msgstr "\nTranzakció Összegzés\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "%5.5s csomag telepítése\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Telepítés" @@ -58041,7 +59428,7 @@ index db7c07f..1041090 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "%5.5s csomag frissítése\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -58049,7 +59436,7 @@ index db7c07f..1041090 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "%5.5s csomag eltávolítása\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -58057,7 +59444,7 @@ index db7c07f..1041090 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "%5.5s csomag újratelepítése\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Újratelepítés" @@ -58065,323 +59452,327 @@ index db7c07f..1041090 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "%5.5s csomag visszaállítva\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Visszaállítás" - --#: ../output.py:1165 -+#: ../output.py:1464 ++ ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" -+ -+#: ../output.py:1524 + +-#: ../output.py:1165 ++#: ../output.py:1531 msgid "Removed" msgstr "Eltávolítva" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Függőség Eltávolítva" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Függőség Telepítve" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Függőség Frissítve" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Lecserélve" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Sikertelen" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "kettő" -@@ -947,7 +987,7 @@ msgstr "kettő" +@@ -947,565 +961,598 @@ msgstr "kettő" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -958,364 +998,416 @@ msgstr "" - "A jelenlegi letöltés megszakítva, %s megszakítás (ctrl-c) mégegyszer %s, %s%s%s másodperc alatt\n" - "a kilépéshez.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-"A jelenlegi letöltés megszakítva, %s megszakítás (ctrl-c) mégegyszer %s, %s%s%s másodperc alatt\n" +-"a kilépéshez.\n" ++msgstr "\nA jelenlegi letöltés megszakítva, %s megszakítás (ctrl-c) mégegyszer %s, %s%s%s másodperc alatt\na kilépéshez.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "Felhasználó által megszakítva" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Összesen" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "<üres>" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Rendszer" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "Egyesített tranzakció kihagyása: %d, mivel fedi a %d tranzakciót." -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Nincsenek tranzakciók" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Rossz tranzakció azonosító vagy csomagnév lett megadva" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Parancssor" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Felhasználó" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "azonosító" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Dátum és idő" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Művelet(ek)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Változtatta" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Nem lett megadva tranzakció azonosító" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Rossz tranzakció azonosító lett megadva" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Nem található a megadott tranzakció azonosítója" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Több, mint egy tranzakció azonosító található!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Nem lett megadva tranzakció azonosító vagy csomag" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Visszaállítva" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Régebbi" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Újabb" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Tranzakció azonosító:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Kezdés ideje :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "rpmdb kezdete:" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u másodperc)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u perc)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u óra)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u nap)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Befejezés ideje:" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "rpmdb befejezése:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Felhasználó :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Visszatérési érték:" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Megszakítva" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Hibák:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Hiba:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Siker" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Parancssor :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "További nem alapértelmezett információ lett eltárolva: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "A tranzakció lezajlott a következővel:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Módosított csomagok:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Kihagyott csomagok:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb hibák:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scriptlet kimenet:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Hibák:" @@ -58390,17 +59781,17 @@ index db7c07f..1041090 100644 -msgstr "Telepítés" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Függőség-Telepítés" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Elavulttá tevés" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Törlés" @@ -58413,295 +59804,309 @@ index db7c07f..1041090 100644 -msgstr "Visszaállítás" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Frissítés" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Időpont" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "1 napja" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "1 hete" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "2 hete" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "3 hónapja" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "6 hónapja" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "1 éve" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Több, mint egy éve" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Nem található a következő tranzakció: %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Tranzakció azonosító:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Rendelkezésre álló további információ az előzményekről:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Nem található további adat erre a névre" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "telepítve" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "egy frissítés" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "törölve" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "újratelepítve" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "egy visszaállítás" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "visszaállítás" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "frissítve" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "elavult" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> A(z) %s.%s %s:%s-%s csomaggal a következő történik: %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Tranzakció ellenőrzés futtatása" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Függőségvizsgálat újraindítása az új változásokkal." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> A függőségvizsgálat véget ért" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> A(z) %s függőség feldolgozása a következő csomaghoz: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Csomag megtartása: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nem talált függőség: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Csomag: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1324,7 +1416,7 @@ msgstr "" - "\n" - " Megkövetel: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Megkövetel: %s" ++msgstr "\n Megkövetel: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1333,7 +1425,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1342,7 +1434,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1351,86 +1443,86 @@ msgstr "" - " Nem található" +-msgstr "" +-"\n" +-" Nem található" ++msgstr "\n Nem található" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Frissítette" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Visszaállította" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Elavulttá tette" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Elérhető" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Konfliktus feldolgozása: %s ellentétben áll: %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> A tranzakció feltöltése csomagokkal. Kis türelmet." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." ++msgstr "---> A(z) %s fejlécének betöltése, hogy a tranzakcióhoz hozzáadhassuk." ++ ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" msgstr "" - "---> A(z) %s fejlécének betöltése, hogy a tranzakcióhoz hozzáadhassuk." +-"---> A(z) %s fejlécének betöltése, hogy a tranzakcióhoz hozzáadhassuk." -#: ../utils.py:99 +#: ../utils.py:129 @@ -58729,7 +60134,7 @@ index db7c07f..1041090 100644 msgstr "Nyomozott/Megállított" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Ismeretlen" @@ -58767,36 +60172,47 @@ index db7c07f..1041090 100644 msgid "" "\n" "\n" -@@ -1440,7 +1532,7 @@ msgstr "" - "\n" - "Felhasználó által megszakítva" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Felhasználó által megszakítva" ++msgstr "\n\nFelhasználó által megszakítva" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1450,7 +1542,7 @@ msgstr "" - "\n" - "Kilépés megtört cső miatt (broken pipe)" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Kilépés megtört cső miatt (broken pipe)" ++msgstr "\n\nKilépés megtört cső miatt (broken pipe)" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1461,7 +1553,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1469,35 +1561,35 @@ msgstr "" - "Egy másik alkalmazás használja a yum zárat, ezért kilépünk, ahogy be van " - "állítva az exit_on_lock szerint" +-msgstr "" +-"Egy másik alkalmazás használja a yum zárat, ezért kilépünk, ahogy be van " +-"állítva az exit_on_lock szerint" ++msgstr "Egy másik alkalmazás használja a yum zárat, ezért kilépünk, ahogy be van állítva az exit_on_lock szerint" -#: ../utils.py:287 +#: ../utils.py:352 @@ -58837,16 +60253,17 @@ index db7c07f..1041090 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1505,7 +1597,7 @@ msgstr "" - "\n" - "Függőségek Megtalálva" +-msgstr "" +-"\n" +-"Függőségek Megtalálva" ++msgstr "\nFüggőségek Megtalálva" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Kész!" -@@ -1517,7 +1609,7 @@ msgstr " Használat:\n" +@@ -1517,7 +1564,7 @@ msgstr " Használat:\n" msgid "You need to be root to perform this command." msgstr "Csak a root felhasználó futtathatja ezt a parancsot." @@ -58855,9 +60272,24 @@ index db7c07f..1041090 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1546,53 +1638,53 @@ msgstr "" +@@ -1532,584 +1579,592 @@ msgid "" + "will install it for you.\n" "\n" - "További információért lépjen kapcsolatba a disztribúciójával ill. a csomagszolgáltatójával.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Ön engedélyezte a csomagok GPG kulcs alapú ellenőrzését. Ez egy jó dolog.\n" +-"Viszont nem található egy GPG kulcs sem, ezért le kéne tölteni\n" +-"a csomagokhoz tartozó kulcsokat, és telepíteni őket.\n" +-"A következő parancs segítségével végezheti ezt el:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Akár megadhatja a használni kívánt url címét a kulcsnak a tárolóknál\n" +-"a 'gpgkey' opció alatt, így a yum telepíteni fogja majd önnek.\n" +-"\n" +-"További információért lépjen kapcsolatba a disztribúciójával ill. a csomagszolgáltatójával.\n" ++msgstr "\nÖn engedélyezte a csomagok GPG kulcs alapú ellenőrzését. Ez egy jó dolog.\nViszont nem található egy GPG kulcs sem, ezért le kéne tölteni\na csomagokhoz tartozó kulcsokat, és telepíteni őket.\nA következő parancs segítségével végezheti ezt el:\n rpm --import public.gpg.key\n\n\nAkár megadhatja a használni kívánt url címét a kulcsnak a tárolóknál\na 'gpgkey' opció alatt, így a yum telepíteni fogja majd önnek.\n\nTovábbi információért lépjen kapcsolatba a disztribúciójával ill. a csomagszolgáltatójával.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -58921,9 +60353,13 @@ index db7c07f..1041090 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1603,306 +1695,295 @@ msgstr "" - "A következő paranccsal engedélyezhet tárolót:\n" - " yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Nincsenek engedélyezett tárolók.\n" +-"Futtassa a \"yum repolist all\" parancsot a tárolók listázásához.\n" +-"A következő paranccsal engedélyezhet tárolót:\n" +-" yum-config-manager --enable " ++msgstr "Nincsenek engedélyezett tárolók.\nFuttassa a \"yum repolist all\" parancsot a tárolók listázásához.\nA következő paranccsal engedélyezhet tárolót:\n yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -59155,120 +60591,120 @@ index db7c07f..1041090 100644 msgstr "Beállított szoftverforrások megjelenítése" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "engedélyezett" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "tiltott" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Tároló-azonosító: " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Tároló-név : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Tároló-állapot: " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Tároló-vizsgálat:" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Tároló-címkék : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Tároló-diszt.-címkék: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Tároló-frissítve: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Tároló-csomagok: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Tároló-méret : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Tároló-baseurl: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Tároló-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Frissítve : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Tároló-tükrök: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Soha (utoljára: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Most (utoljára: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s másodperc (utoljára: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Tároló-lejárat: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Tároló-kizárás:" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Tároló-tartalmaz: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Tároló-kizárt: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Tároló-fájlnév: " @@ -59276,190 +60712,196 @@ index db7c07f..1041090 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "tároló azon" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "állapot" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "tároló név" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Egy használati tipp mutatása" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Nincs súgó az alábbi témakörben: %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1912,7 +1993,7 @@ msgstr "" - "\n" - "alias-ok: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"alias-ok: " ++msgstr "\n\nalias-ok: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1922,117 +2003,163 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Újratelepítő folyamat indítása" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "egy csomag újratelepítése" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Visszaállítási folyamat indítása" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "egy csomag visszaállítása" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Verzió és/vagy elérhető tárolók megjelenítése" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum verzió csoportok:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Csoport :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "Csomagok:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Telepített:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Telepített csoport:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Elérhető:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Elérhető csoport:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Korábbi tranzakciók használata vagy megjelenítése" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Helytelen alparancs az előzményekhez, használja a következőt: %s" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Ön nem tudja elérni az előzmények adatbázisát." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Hibák keresése az rpmdb-ben" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "egy elmentett tranzakció betöltése fájlnév alapján" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nincs meghatározva az elmentett tranzakció fájlja." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "tranzakciók betöltések a következőből: %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -59469,28 +60911,29 @@ index db7c07f..1041090 100644 #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +-msgstr "" +msgstr " Yum ellenőrzés meghiúsult: %s" -+ + +-#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" msgstr "" +-"Egy másik alkalmazás jelenleg használja a yum zárolást; várakozás annak " +-"kilépésére..." --#: ../yummain.py:114 +-#: ../yummain.py:120 +#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" + msgid "Can't create lock file; exiting" +-msgstr "" +msgstr "Nem sikerült lezárni; kilépés..." + +#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Egy másik alkalmazás jelenleg használja a yum zárolást; várakozás annak " - "kilépésére..." ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Egy másik alkalmazás jelenleg használja a yum zárolást; várakozás annak kilépésére..." --#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -59511,281 +60954,288 @@ index db7c07f..1041090 100644 msgid "" "\n" "\n" -@@ -2042,74 +2169,74 @@ msgstr "" - "\n" - "Kilépés felhasználói megszakítás miatt." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Kilépés felhasználói megszakítás miatt." ++msgstr "\n\nKilépés felhasználói megszakítás miatt." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "A doTsSetup() már nem lesz elérhető a későbbi Yum verziókban.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Tranzakciók indítása a konfigurációs osztályok felállása előtt" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Hibás tsflag a következő konfigurációs fájlban: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Keresés a pkgSack-ben függőség után: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Tag: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "A(z) %s át lett konvertálva telepítéshez" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "A(z) %s nevű csomag hozzáadása %s módban" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "A következő csomag eltávolítása: %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "A(z) %s megköveteli a következőket: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "A(z) %s megköveteli a következőt: %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "A szükséges dolognak már utánanéztek, lecsaljuk" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "A megkövetelt dolog nem csomag, ezért utánanézünk: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Lehetséges Szolgáltató: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "A mód %s a(z) %s kiszolgáló felé: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s" -@@ -2117,117 +2244,117 @@ msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s" +@@ -2117,1042 +2172,1029 @@ msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Kisérlet a(z) %s frissítésére a függőségek feloldásához" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "Nem található frissítési útvonal a következőhöz: %s." -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: A(z) %s nevű csomaghoz szükséges a(z) %s törlése" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: %s lecserélése függőség miatt a következőre: %s." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: %s frissítése függőség miatt." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Nem található frissítési útvonal a következőhöz: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "A(z) %s követelménye %s (gyors találattal)" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s az ellátandó csomagoknál található, bár telepítve van, ezért " - "eltávolítjuk." +-msgstr "" +-"%s az ellátandó csomagoknál található, bár telepítve van, ezért " +-"eltávolítjuk." ++msgstr "%s az ellátandó csomagoknál található, bár telepítve van, ezért eltávolítjuk." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "A lehetséges %s nevű csomag már újabb verzióval szerepel a tranzakcióban." +-msgstr "" +-"A lehetséges %s nevű csomag már újabb verzióval szerepel a tranzakcióban." ++msgstr "A lehetséges %s nevű csomag már újabb verzióval szerepel a tranzakcióban." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "A lehetséges %s nevű csomagból már újabb verzió van telepítve." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "A(z) %s már szerepel a tranzakcióban, kihagyás" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s bejelölése a(z) %s frissítéseként" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: A(z) %s telepítésre való bejelölése a következőhöz: %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Siker - üres tranzakció" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Folyamat újraindítása" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Függőségkezelő folyamat végetért" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Siker - függőségek megoldva" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Függőségek keresése a következőre: %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "A(z) %s keresése, mint a(z) %s szükséglete." -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "A compare_providers() parancs futtatása a következőhöz: %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "Jobb architektúra a következőben: %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "A(z) %s már újabb, mint a(z) %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2236,144 +2363,144 @@ msgstr "" - "archdist osszehasonlítva %s a következőhöz: %s a következőn: %s\n" - " Nyertes: %s" + " Winner: %s" +-msgstr "" +-"archdist osszehasonlítva %s a következőhöz: %s a következőn: %s\n" +-" Nyertes: %s" ++msgstr "archdist osszehasonlítva %s a következőhöz: %s a következőn: %s\n Nyertes: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "gyakori forrásrpm %s és %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "legjobb %s nevű csomag telepítve van a következőhöz: %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "gyakori előtag a következőre: %s, %s és %s között" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "minimum szükséges: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Nyertes: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Vesztes(ezzel: %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Legjobb sorrend: %s" @@ -59805,9 +61255,10 @@ index db7c07f..1041090 100644 +#: ../yum/__init__.py:533 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "A %r tárolónak hiányzik a neve a konfigurációban, ezért azonosítót " - "használunk." +-msgstr "" +-"A %r tárolónak hiányzik a neve a konfigurációban, ezért azonosítót " +-"használunk." ++msgstr "A %r tárolónak hiányzik a neve a konfigurációban, ezért azonosítót használunk." -#: ../yum/__init__.py:526 +#: ../yum/__init__.py:571 @@ -59920,9 +61371,10 @@ index db7c07f..1041090 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2381,21 +2508,21 @@ msgstr "" - "Félbehagyott tranzakciók találhatóak. Ha be kívánja azokat fejezni, " - "használja a yum-complete-transaction parancsot." +-msgstr "" +-"Félbehagyott tranzakciók találhatóak. Ha be kívánja azokat fejezni, " +-"használja a yum-complete-transaction parancsot." ++msgstr "Félbehagyott tranzakciók találhatóak. Ha be kívánja azokat fejezni, használja a yum-complete-transaction parancsot." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -59948,9 +61400,10 @@ index db7c07f..1041090 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2403,54 +2530,54 @@ msgstr "" - "\n" - "Az alábbi csomagok ki lettek hagyva függőségi problémák miatt:" +-msgstr "" +-"\n" +-"Az alábbi csomagok ki lettek hagyva függőségi problémák miatt:" ++msgstr "\nAz alábbi csomagok ki lettek hagyva függőségi problémák miatt:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -59963,9 +61416,10 @@ index db7c07f..1041090 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** %d már meglévő rpmdb probléma található, 'yum check' kimenet pedig a " - "következő:" +-msgstr "" +-"** %d már meglévő rpmdb probléma található, 'yum check' kimenet pedig a " +-"következő:" ++msgstr "** %d már meglévő rpmdb probléma található, 'yum check' kimenet pedig a következő:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -59986,8 +61440,9 @@ index db7c07f..1041090 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Figyelem: scriptlet vagy egyéb nem végzetes hiba adódott a tranzakció során." +-msgstr "" +-"Figyelem: scriptlet vagy egyéb nem végzetes hiba adódott a tranzakció során." ++msgstr "Figyelem: scriptlet vagy egyéb nem végzetes hiba adódott a tranzakció során." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -60009,11 +61464,12 @@ index db7c07f..1041090 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" - msgstr "" -@@ -2458,37 +2585,40 @@ msgstr "" +-msgstr "" +-"A(z) %s nevű csomagnak már telepítve kellett volna lennie, habár nincs." ++msgstr "A(z) %s nevű csomagnak már telepítve kellett volna lennie, habár nincs." #. maybe a file log here, too #. but raising an exception is not going to do any good @@ -60021,25 +61477,24 @@ index db7c07f..1041090 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" - msgstr "" - "A(z) %s nevű csomagok már el kellett volna távolítani, habár ez még nem " - "történt meg." - +-msgstr "" +-"A(z) %s nevű csomagok már el kellett volna távolítani, habár ez még nem " +-"történt meg." +- -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "A zárolás feloldása nem lehetséges: %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "A zárolás feloldása nem lehetséges: %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Nem lehetséges az ellenőrzés, ha a %s PID aktív" +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Nem lehetséges az ellenőrzés, ha a %s PID aktív" ++msgstr "A(z) %s nevű csomagok már el kellett volna távolítani, habár ez még nem történt meg." #. Another copy seems to be running. -#: ../yum/__init__.py:1789 @@ -60050,40 +61505,55 @@ index db7c07f..1041090 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nem zárható le a következő: %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "A zárolás feloldása nem lehetséges: %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Nem lehetséges az ellenőrzés, ha a %s PID aktív" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2497,42 +2627,31 @@ msgstr "" - "A csomag nem egyezik a várt letöltéssel. Ajánlott futtatni az alábbi parancsot:\n" - "yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"A csomag nem egyezik a várt letöltéssel. Ajánlott futtatni az alábbi parancsot:\n" +-"yum --enablerepo=%s clean metadata" ++msgstr "A csomag nem egyezik a várt letöltéssel. Ajánlott futtatni az alábbi parancsot:\nyum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Ellenőrzőösszeg végrehajtása nem lehetséges" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "A csomag nem egyezik az ellenőrzőösszeggel" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "A csomag nem egyezik az ellenőrzőösszeggel, de a gyorsítótárazás " - "engedélyezett a következőhöz: %s" +-msgstr "" +-"A csomag nem egyezik az ellenőrzőösszeggel, de a gyorsítótárazás " +-"engedélyezett a következőhöz: %s" ++msgstr "A csomag nem egyezik az ellenőrzőösszeggel, de a gyorsítótárazás engedélyezett a következőhöz: %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "helyi másolat használata a következőhöz: %s" @@ -60100,69 +61570,70 @@ index db7c07f..1041090 100644 -" * szükséges %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "A fejléc nem teljes." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2540,62 +2659,64 @@ msgstr "" - "A fejléc nem található meg a helyi gyorsítótárban és a \"csak " - "gyorsítótárazás\" mód be van kapcsolva. Nem tölthető le a következő: %s" +-msgstr "" +-"A fejléc nem található meg a helyi gyorsítótárban és a \"csak " +-"gyorsítótárazás\" mód be van kapcsolva. Nem tölthető le a következő: %s" ++msgstr "A fejléc nem található meg a helyi gyorsítótárban és a \"csak gyorsítótárazás\" mód be van kapcsolva. Nem tölthető le a következő: %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "A publikus kulcs nincs telepítve a következőhöz: %s" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Hiba a következő csomag megnyitásánál: %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "A publikus kulcs nem megbízható a következőhöz: %s" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "A következő csomag nincs aláírva: %s" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Nem távolítható el: %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s eltávolítva" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Nem távolítható el a %s nevű fájl: %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s fájl %s eltávolította" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fájl eltávolítva" @@ -60172,28 +61643,29 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Több, mint egy azonos találat a tömbben a következőre: %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Semmi sem egyezik a következővel: %s.%s %s:%s-%s a frissítésből" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2603,122 +2724,127 @@ msgstr "" - "A searchPackages() parancs már nem lesz elérhető a későbbi Yum verziókban.\n" - "Kérjük, inkább használja a searchGenerator() parancsot helyette.\n" +-msgstr "" +-"A searchPackages() parancs már nem lesz elérhető a későbbi Yum verziókban.\n" +-"Kérjük, inkább használja a searchGenerator() parancsot helyette.\n" ++msgstr "A searchPackages() parancs már nem lesz elérhető a későbbi Yum verziókban.\nKérjük, inkább használja a searchGenerator() parancsot helyette.\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "%d csomag keresése" @@ -60203,414 +61675,425 @@ index db7c07f..1041090 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "A következő csomag keresése: %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "Keresés fájlbejegyzésekben" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "Keresés ellátási bejegyzésekben" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Nincsenek elérhető csoportadatok a beállított tárolókban" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Nincs %s nevű csoport" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "A(z) %s nevű csomag nem lett bejelölve a következő csoportban: %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "A(z) %s nevű csomag hozzáadás a következő csoportból: %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Nincs telepíthető csomag %s néven." -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Figyelem: A(z) %s csoport nem tartalmaz egyetlen csomagot sem." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." - msgstr "" -+"A(z) %s csoportnak %u feltételes csomagja van, amelyek lehet, hogy " -+"telepítésre kerülnek." +-msgstr "" ++msgstr "A(z) %s csoportnak %u feltételes csomagja van, amelyek lehet, hogy telepítésre kerülnek." #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "A csomagtömbben nem található leíró a következőre: %s" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Az rpmdb nem tartalmaz csomagleírót a következőre: %s" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "Érvénytelen verzió: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Nem található csomag a következőre: %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "A Csomag Objektum nem egy csomag-objektum példány" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Semmi sem lett megadva telepítésnek" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" - msgstr "" - "Virtuális szolgáltatása vagy fájlszolgáltatás ellenőrzése a következőre: %s" +-msgstr "" +-"Virtuális szolgáltatása vagy fájlszolgáltatás ellenőrzése a következőre: %s" ++msgstr "Virtuális szolgáltatása vagy fájlszolgáltatás ellenőrzése a következőre: %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Nincs találat a következő argumentumra: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "A(z) %s nevű csomag telepítve, bár nem érhető el" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Nincsenek elérhető csomagok telepítésre" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Csomag: %s - már szerepel a tranzakcióban" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "A csomag %s cserélve lett a következőre: %s, ami már telepítve van" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2727,19 +2853,19 @@ msgstr "" - "A(z) %s nevű csomag már elavult a következő miatt: %s, bár ez nem teljesíti " - "a követelményeket" + "requirements" +-msgstr "" +-"A(z) %s nevű csomag már elavult a következő miatt: %s, bár ez nem teljesíti " +-"a követelményeket" ++msgstr "A(z) %s nevű csomag már elavult a következő miatt: %s, bár ez nem teljesíti a követelményeket" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "A(z) %s nevű csomag már elavult a következő miatt: %s, próbálkozás inkább " - "a(z) %s telepítésével" +-msgstr "" +-"A(z) %s nevű csomag már elavult a következő miatt: %s, próbálkozás inkább " +-"a(z) %s telepítésével" ++msgstr "A(z) %s nevű csomag már elavult a következő miatt: %s, próbálkozás inkább a(z) %s telepítésével" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "A(z) %s nevű csomag már a legfrissebb verzióval rendelkezik" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" -@@ -2747,70 +2873,76 @@ msgstr "" - " keresése." +-msgstr "" +-"A csomag, mely megegyezik a következővel: %s, már telepítve van. Frissítések" +-" keresése." ++msgstr "A csomag, mely megegyezik a következővel: %s, már telepítve van. Frissítések keresése." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Minden frissítése" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" - msgstr "" - "Azon csomagok nem lesznek frissítve, melyek már elavultak: %s.%s %s:%s-%s" +-msgstr "" +-"Azon csomagok nem lesznek frissítve, melyek már elavultak: %s.%s %s:%s-%s" ++msgstr "Azon csomagok nem lesznek frissítve, melyek már elavultak: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "A következő csomag már elavult: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "A következő elavult csomag nem lesz frissítve: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "Azon csomagok nem lesznek frissítve, melyek már frissítve vannak: %s.%s " - "%s:%s-%s" +-msgstr "" +-"Azon csomagok nem lesznek frissítve, melyek már frissítve vannak: %s.%s " +-"%s:%s-%s" ++msgstr "Azon csomagok nem lesznek frissítve, melyek már frissítve vannak: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nem található csomag eltávolításra" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "A futó kernel kihagyása: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "%s eltávolítása a tranzakcióból" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nem nyitható meg a következő: %s. Kihagyás." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "%s felülvizsgálata: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." - msgstr "" - "Nem lehet helyileg telepíteni a következő deltarpm fájlt: %s. Kihagyás." +-msgstr "" +-"Nem lehet helyileg telepíteni a következő deltarpm fájlt: %s. Kihagyás." ++msgstr "Nem lehet helyileg telepíteni a következő deltarpm fájlt: %s. Kihagyás." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2818,14 +2950,14 @@ msgstr "" - "Nem lehet a(z) %s csomagot hozzáadni a tranzakcióhoz. Nincs kompatibilis " - "architektúra: %s" +-msgstr "" +-"Nem lehet a(z) %s csomagot hozzáadni a tranzakcióhoz. Nincs kompatibilis " +-"architektúra: %s" ++msgstr "Nem lehet a(z) %s csomagot hozzáadni a tranzakcióhoz. Nincs kompatibilis architektúra: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Nem lehet telepíteni a következő csomagot: %s. Ez már elavultnak számít a " - "ezen telepített csomag miatt: %s" +-msgstr "" +-"Nem lehet telepíteni a következő csomagot: %s. Ez már elavultnak számít a " +-"ezen telepített csomag miatt: %s" ++msgstr "Nem lehet telepíteni a következő csomagot: %s. Ez már elavultnak számít a ezen telepített csomag miatt: %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2834,138 +2966,147 @@ msgstr "" - "A(z) %s nevű csomag már telepítve van, frissítése nem lehetséges. Kérjük, " - "használja ehelyett a yum install parancsot a telepítéséhez." + "instead." +-msgstr "" +-"A(z) %s nevű csomag már telepítve van, frissítése nem lehetséges. Kérjük, " +-"használja ehelyett a yum install parancsot a telepítéséhez." ++msgstr "A(z) %s nevű csomag már telepítve van, frissítése nem lehetséges. Kérjük, használja ehelyett a yum install parancsot a telepítéséhez." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." - msgstr "" -+"A következő csomag nincs telepítve: %s.%s, ezért nem lehet frissíteni. " -+"Futtassa a \"yum install\" parancsot a telepítéshez." +-msgstr "" ++msgstr "A következő csomag nincs telepítve: %s.%s, ezért nem lehet frissíteni. Futtassa a \"yum install\" parancsot a telepítéshez." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "%s kizárása" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s megjelölése telepítésre" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "%s megjelölése, mint %s frissítése" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: nem frissíti a telepített csomagot." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nem nyitható meg a következő fájl: %s. Kihagyás." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Probléma az újratelepítésnél: egy csomag sem eltávolítandó" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Probléma az újratelepítésnél: nem található %s nevű csomag telepítéshez" +-msgstr "" +-"Probléma az újratelepítésnél: nem található %s nevű csomag telepítéshez" ++msgstr "Probléma az újratelepítésnél: nem található %s nevű csomag telepítéshez" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Nincsenek elérhető csomagok visszaállításhoz" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "A(z) %s csomag többször is telepíthető, kihagyás" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Nem található csomag a következőre: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Csak frissítés érhető el a következő csomagnál: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Visszaállítás meghiúsult: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 #, python-format -msgid "Retrieving key from %s" +msgid "Failed to upgrade: %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 +#, python-format +msgid "Retrieving key from %s" +msgstr "GPG kulcs beszerzése a következőből: %s" + -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG kulcs beszerzés meghiúsult: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" -msgstr "" +msgstr "A(z) %s GPG kulcs aláírása nem egyezik a tároló CA kulcsával: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "A GPG kulcs sikeresen ellenőrizve lett a CA kulcsokkal" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Hibás GPG kulcs a következőből: %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG kulcs elemzés meghiúsult: a kulcs nem tartalmaz értéket: %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -60624,7 +62107,7 @@ index db7c07f..1041090 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -60636,194 +62119,196 @@ index db7c07f..1041090 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "A következő GPG kulcs már telepítve van: %s (0x%s)" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "A kulcs importálása meghiúsult (hibakód %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "A kulcs importálása sikeres" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" -msgstr "" +msgstr "Nem lett telepítve egyetlen kulcs sem" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2974,25 +3115,25 @@ msgstr "" - "A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók ehhez a csomaghoz.\n" - "Kérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók ehhez a csomaghoz.\n" +-"Kérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." ++msgstr "A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók ehhez a csomaghoz.\nKérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "A kulcsok importálása nem segített, rossz kulcsok?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "A következő GPG kulcs már telepítve van: %s (0x%s)" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "A kulcs importálása meghiúsult" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Nem lett telepítve egyetlen kulcs sem a következő tárolóhoz: %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3001,158 +3142,186 @@ msgstr "" - "A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók.\n" - "Kérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók.\n" +-"Kérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." ++msgstr "A GPG kulcsok a(z) \"%s\" nevű tárolóhoz már telepítve vannak, de nem jók.\nKérjük, ellenőrizze, hogy az URL címek helyesen vannak-e megadva ezen tárolóhoz." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Nem található megfelelő tükörszerver." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Hiba történt a csomagok letöltése közben." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Kérjük, jelentse ezt a hibát a következő címen: %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Tranzakció teszt hibák: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Gyorsítótár-mappa beállítása meghiúsult: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" -+"A függőségek feloldása még nincs kész. Nem lehet a függőben lévő tranzakciót" -+" menteni." +-msgstr "" ++msgstr "A függőségek feloldása még nincs kész. Nem lehet a függőben lévő tranzakciót menteni." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "A következő tranzakciófájl mentése meghiúsult: %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Az elmentett tranzakció beolvasása meghiúsult: %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "Az rpmdb verziója nem egyezik a mentett tranzakció verziójával, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." -msgstr "" +msgstr " kihagyva, ahogy kértük." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." -msgstr "" +msgstr "megszakítás." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "Nem található a tsflags, vagy a tsflags nem egész szám." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "txmbr található a jelenleg ismeretlen állapotban: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "Nem található txmbr: %s állapotban %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Nem található txmbr: %s, innen: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," - msgstr "" -+"A tranzakció elemek, tranzakció-viszonyok hiányoznak, vagy a ts feltehetően " -+"megváltozott," +-msgstr "" ++msgstr "A tranzakció elemek, tranzakció-viszonyok hiányoznak, vagy a ts feltehetően megváltozott," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" +msgstr " átugorva, ahogy kérte. Szükséges a redepsolve!" + +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." msgstr "" @@ -60875,8 +62360,9 @@ index db7c07f..1041090 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Kettő vagy több plugin már léteik a keresési útvonalon a következő néven: %s" +-msgstr "" +-"Kettő vagy több plugin már léteik a keresési útvonalon a következő néven: %s" ++msgstr "Kettő vagy több plugin már léteik a keresési útvonalon a következő néven: %s" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -60924,29 +62410,48 @@ index db7c07f..1041090 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s ellátja a következőt: %s, de nem található" -@@ -3161,6 +3330,17 @@ msgstr "%s ellátja a következőt: %s, de nem található" +@@ -3161,6 +3203,19 @@ msgstr "%s ellátja a következőt: %s, de nem található" msgid "Repackaging" msgstr "Újracsomagolás" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Nincs elég hely a letöltési könyvtárban: %s\n" -+" * szabad %s\n" -+" * szükséges %s" ++msgstr "Nincs elég hely a letöltési könyvtárban: %s\n * szabad %s\n * szükséges %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3173,9 +3228,7 @@ msgstr "RPM %s md5 ellenőrzése hibát mutat" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Nem nyitható meg olvasásra az RPM adatbázis. Elképzelhető, hogy már " +-"használatban van." ++msgstr "Nem nyitható meg olvasásra az RPM adatbázis. Elképzelhető, hogy már használatban van." + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3191,5 +3244,3 @@ msgstr "Sérült Fejléc %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Hiba a következő rpm megnyitásánál: %s - hiba: %s" +- +- diff --git a/po/id.po b/po/id.po -index 2fbdf46..062d956 100644 +index 2fbdf46..c48030b 100644 --- a/po/id.po +++ b/po/id.po -@@ -2,13 +2,14 @@ +@@ -2,427 +2,444 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -60954,22 +62459,24 @@ index 2fbdf46..062d956 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Indonesian (http://www.transifex.net/projects/p/yum/team/id/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Indonesian (http://www.transifex.net/projects/p/yum/team/id/)\n" ++"Language-Team: Indonesian (http://www.transifex.net/projects/p/yum/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,413 +17,429 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: id\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -60980,31 +62487,31 @@ index 2fbdf46..062d956 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -61031,7 +62538,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -61041,69 +62548,69 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -61113,98 +62620,98 @@ index 2fbdf46..062d956 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -61212,7 +62719,7 @@ index 2fbdf46..062d956 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -61220,13 +62727,13 @@ index 2fbdf46..062d956 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -61235,12 +62742,12 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -61249,12 +62756,12 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -61263,27 +62770,27 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -61291,158 +62798,158 @@ index 2fbdf46..062d956 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -61451,18 +62958,18 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -61471,37 +62978,37 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -61510,353 +63017,353 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -61864,190 +63371,190 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" +msgstr[0] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -62058,76 +63565,76 @@ index 2fbdf46..062d956 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -62136,271 +63643,271 @@ index 2fbdf46..062d956 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +957,536 @@ msgid "" +@@ -935,484 +957,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -62409,17 +63916,17 @@ index 2fbdf46..062d956 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -62432,224 +63939,224 @@ index 2fbdf46..062d956 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -62657,7 +64164,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -62665,7 +64172,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -62673,7 +64180,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -62681,43 +64188,49 @@ index 2fbdf46..062d956 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -62743,7 +64256,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -62797,7 +64310,7 @@ index 2fbdf46..062d956 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1494,47 @@ msgid "" +@@ -1420,47 +1500,47 @@ msgid "" "%s" msgstr "" @@ -62854,7 +64367,7 @@ index 2fbdf46..062d956 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1546,7 @@ msgstr "" +@@ -1472,7 +1552,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -62863,7 +64376,7 @@ index 2fbdf46..062d956 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1563,480 @@ msgid "" +@@ -1489,451 +1569,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -63033,14 +64546,14 @@ index 2fbdf46..062d956 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -63160,153 +64673,153 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -63314,7 +64827,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -63322,148 +64835,148 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2047,106 @@ msgstr "" +@@ -1944,100 +2053,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -63508,226 +65021,226 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2154,1026 @@ msgstr "" +@@ -2045,991 +2160,1027 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -63735,43 +65248,43 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -63984,7 +65497,7 @@ index 2fbdf46..062d956 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -63995,40 +65508,46 @@ index 2fbdf46..062d956 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -64036,23 +65555,23 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -64066,67 +65585,67 @@ index 2fbdf46..062d956 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -64135,26 +65654,26 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -64163,62 +65682,62 @@ index 2fbdf46..062d956 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -64226,79 +65745,79 @@ index 2fbdf46..062d956 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -64306,118 +65825,118 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -64425,7 +65944,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -64433,118 +65952,118 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -64558,7 +66077,7 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -64570,29 +66089,29 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -64600,29 +66119,29 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -64630,117 +66149,117 @@ index 2fbdf46..062d956 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -64840,10 +66359,15 @@ index 2fbdf46..062d956 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3182,14 @@ msgstr "" +@@ -3038,6 +3189,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -64855,8 +66379,14 @@ index 2fbdf46..062d956 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3230,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/id_ID.po b/po/id_ID.po -index 964c239..35410f6 100644 +index 964c239..0ba286e 100644 --- a/po/id_ID.po +++ b/po/id_ID.po @@ -2,14 +2,15 @@ @@ -64869,22 +66399,23 @@ index 964c239..35410f6 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,415 +18,431 @@ msgstr "" +@@ -17,923 +18,931 @@ msgstr "" "Language: id_ID\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Memutakhirkan" @@ -64895,31 +66426,31 @@ index 964c239..35410f6 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Memasang" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Usang" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Termutakhirkan" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Dihapus" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Terpasang" @@ -64946,7 +66477,7 @@ index 964c239..35410f6 100644 msgstr "Dihapus: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Menghapus" @@ -64956,69 +66487,69 @@ index 964c239..35410f6 100644 msgstr "Pembersihan" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Menyiapkan repositori" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Membaca metadata repositori dari berkas lokal" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Kesalahan Konfigurasi: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Kesalahan Opsi: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Terpasang: %s-%s di %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Anda perlu memberi beberapa perintah" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Persyaratan Disk:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Setidaknya dibutuhkan ruang %dMB lagi di sistem berkas %s.\n" @@ -65028,100 +66559,101 @@ index 964c239..35410f6 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Mencoba untuk menjalankan transaksi tetapi tidak ada yang harus dikerjakan. " - "Keluar." +-msgstr "" +-"Mencoba untuk menjalankan transaksi tetapi tidak ada yang harus dikerjakan. " +-"Keluar." ++msgstr "Mencoba untuk menjalankan transaksi tetapi tidak ada yang harus dikerjakan. Keluar." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Mengunduh Paket-paket:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Kesalahan Saat Mengunduh Paket-paket:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "GALAT Anda perlu memperbarui rpm untuk menangani:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM perlu dimutakhirkan" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Laporkan kesalahan di %s ini" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Menjalankan Uji Transaksi" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Kesalahan Pengujian Transaksi:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Uji Transaksi Berhasil" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Menjalankan Transaksi" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Mungkin maksud Anda: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paket %s%s%s tersedia, tapi tidak terpasang." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Tidak ada paket %s%s%s yang tersedia." @@ -65129,7 +66661,7 @@ index 964c239..35410f6 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket yang akan dipasang" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -65137,13 +66669,13 @@ index 964c239..35410f6 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Tak ada tindakan yang dilakukan" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paket telah ditandai untuk dimutakhirkan" @@ -65152,12 +66684,12 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Tidak ada Paket yang ditandai untuk dimutakhirkan" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -65166,12 +66698,12 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paket ditandai untuk dihapus" @@ -65180,27 +66712,27 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Tidak ada paket yang ditandai untuk dihapus" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (dari %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Paket %s%s%s%s yang terpasang tidak tersedia." @@ -65208,158 +66740,158 @@ index 964c239..35410f6 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket yang akan dipasang ulang" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Tidak ada paket yang tersedia" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paket yang akan dipasang" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Cocok: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Peringatan: Tidak ada yang cocok: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Tidak ada yang cocok" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Tidak ada paket yang ditemukan untuk %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Membersihkan repo: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Membersihkan Semuanya" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Membersihkan Header" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Membersihkan Paket-paket" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Membersihkan metadata xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Membersihkan singgahan basis data" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Membersihkan metadata singgahan yang kadaluarsa" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Membersihkan data rpmdb yang disinggahkan" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Membersihkan pengaya" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Grup yang terpasang:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Grup yang Tersedia:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Selesai" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Peringatan: Grup %s tidak ada." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Paket yang akan dipasang" @@ -65368,18 +66900,18 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Tidak ada nama grup %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Tidak ada paket yang akan dihapus dari grup" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Paket akan dihapus" @@ -65388,606 +66920,619 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s sudah diinstal, lewati" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opsi Pengaya" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Galat di perintah baris: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -436,287 +453,291 @@ msgstr "" "\n" - "%s: opsi %s membutuhkan argumen" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: opsi %s membutuhkan argumen" ++msgstr "\n\n%s: opsi %s membutuhkan argumen" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "tampilkan pesan bantuan ini dan keluar" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "toleran terhadap kesalahan" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" - msgstr "" - "jalankan sepenuhnya dari singgahan sistem, jangan memutakhirkan persinggahan" +-msgstr "" +-"jalankan sepenuhnya dari singgahan sistem, jangan memutakhirkan persinggahan" ++msgstr "jalankan sepenuhnya dari singgahan sistem, jangan memutakhirkan persinggahan" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "lokasi berkas konfigurasi" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "waktu tunggu perintah maksimum" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "operasi senyap" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "jawab ya untuk semua pertanyaan" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "tampilkan versi Yum dan keluar" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "aktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" +-msgstr "" +-"aktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" ++msgstr "aktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "nonaktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" +-msgstr "" +-"nonaktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" ++msgstr "nonaktifkan satu atau lebih repositori (diperbolehkan menggunakan wildcard)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "nonaktifkan pengaya Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "nonaktifkan pemeriksaan tanda tangan gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "nonaktifkan pengaya berdasarkan nama" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "aktifkan pengaya berdasarkan nama" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "tentukan nilai $releasever di berkas konfigurasi yum dan repo" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Mei" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Agu" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Okt" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Des" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Nama : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arst : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Versi : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Rilis : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Ukuran : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repo : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Dari repo : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Waktu pemasangan: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Dipasang oleh: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Diubah oleh : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Ringkasan : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Lisensi : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Keterangan : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ya" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "no" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -725,154 +746,155 @@ msgstr "" - "\n" - "Grup: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grup: %s" ++msgstr "\nGrup: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " ID-Grup: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Deskripsi: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Paket-paket Wajib:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Paket-paket Opsional:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paket: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Lisensi : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Nama berkas : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Lainnya : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Ada kesalahan saat menghitung ukuran total pengunduhan" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Ukuran total: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Total ukuran pengunduhan: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Ukuran terpasang: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Ada kesalahan saat menghitung ukuran terpasang" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Memasang ulang" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Tidak terpasang" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" +msgstr[0] "Paket" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arst" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versi" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repositori" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Ukuran" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -883,57 +905,57 @@ msgstr "" - "Ringkasan Transaksi\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Ringkasan Transaksi\n" +-"%s\n" ++msgstr "\nRingkasan Transaksi\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Pasang %5.5s Paket\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Instal" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" @@ -65995,7 +67540,7 @@ index 964c239..35410f6 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Hapus %5.5s Paket\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -66003,328 +67548,328 @@ index 964c239..35410f6 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Pasang Ulang %5.5s Paket\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Instal Ulang" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Dihapus" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Ketergantungan Dihapus" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Ketergantungan Dipasang" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Ketergantungan Dimutakhirkan" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Diganti" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Gagal" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "dua" -@@ -941,7 +963,7 @@ msgstr "dua" +@@ -941,7 +950,7 @@ msgstr "dua" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -949,364 +971,416 @@ msgid "" +@@ -949,543 +958,590 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "diinterupsi pengguna" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Sistem" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Tanggal dan waktu" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Tindakan" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Diubah" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Tak ada ID transaksi yang diberikan" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Tidak ditemukan ID transaksi yang diberikan" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Ditemukan lebih dari satu ID transaksi!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Tidak ada ID transaksi, atau paket, yang diberikan" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Lebih Lama" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Lebih Baru" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "ID Transaksi:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Waktu mulai :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Waktu selesai :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Pengguna :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Kode-Balikan :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Dibatalkan" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Kegagalan:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Sukses" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Perintah Baris :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transaksi dilakukan dengan:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Paket Diubah:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Paket Dilewati:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Permasalahan rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Keluaran scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -66333,17 +67878,17 @@ index 964c239..35410f6 100644 -msgstr "Instal" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Hapus" @@ -66356,296 +67901,310 @@ index 964c239..35410f6 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Mutakhirkan" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Waktu" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Hari terakhir" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Minggu lalu" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "2 minggu terakhir" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "3 bulan terakhir" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "6 bulan terakhir" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Setahun terakhir" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Lebih dari setahun yang lalu" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "terpasang" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "dihapus" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "dipasang ulang" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "termutakhirkan" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "usang" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Menjalankan pemeriksaan transaksi" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paket: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1315,7 +1389,7 @@ msgstr "" - "\n" - " Dibutuhkan: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Dibutuhkan: %s" ++msgstr "\n Dibutuhkan: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1324,7 +1398,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1333,7 +1407,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1342,99 +1416,99 @@ msgstr "" - " Tidak ditemukan" +-msgstr "" +-"\n" +-" Tidak ditemukan" ++msgstr "\n Tidak ditemukan" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Dimutakhirkan Oleh" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Tersedia" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Berjalan" @@ -66671,7 +68230,7 @@ index 964c239..35410f6 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Tak diketahui" @@ -66725,9 +68284,13 @@ index 964c239..35410f6 100644 #, python-format msgid "" "\n" -@@ -1445,47 +1519,47 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -66782,7 +68345,7 @@ index 964c239..35410f6 100644 msgid "Complete!" msgstr "Selesai!" -@@ -1497,7 +1571,7 @@ msgstr "" +@@ -1497,7 +1553,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -66791,7 +68354,7 @@ index 964c239..35410f6 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1514,53 +1588,53 @@ msgid "" +@@ -1514,454 +1570,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -66856,9 +68419,12 @@ index 964c239..35410f6 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1570,398 +1644,427 @@ msgstr "" - "Jalankan \"yum repolist all\" untuk melihat repo apa yang Anda miliki.\n" - "Anda dapat mengaktifkan repo dengan yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Tidak ada repo yang aktif.\n" +-"Jalankan \"yum repolist all\" untuk melihat repo apa yang Anda miliki.\n" +-"Anda dapat mengaktifkan repo dengan yum-config-manager --enable " ++msgstr "Tidak ada repo yang aktif.\nJalankan \"yum repolist all\" untuk melihat repo apa yang Anda miliki.\nAnda dapat mengaktifkan repo dengan yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -67089,153 +68655,153 @@ index 964c239..35410f6 100644 msgstr "Tampilkan repositori perangkat lunak yang terkonfigurasi" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "aktif" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "nonaktif" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "ID-Repo : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Nama-Repo : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Status-Repo : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Revisi-Repo: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Tag-Repo : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Ukuran-Repo : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Tak Pernah (terakhir: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -67243,7 +68809,7 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -67251,148 +68817,148 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Menampilkan versi mesin dan/atau repo yang tersedia." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Grup versi Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Grup :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Paket:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Terpasang:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Grup-Terpasang:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Tersedia" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Grup-Tersedia:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Tampilkan, atau gunakan, riwayat transaksi" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Anda tidak memiliki akses ke DB riwayat" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Memeriksa masalah di rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1972,100 +2075,106 @@ msgstr "" +@@ -1972,100 +2054,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -67437,226 +69003,226 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Anggota: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s telah dikonversi untuk instalasi" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Menghapus Paket: %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s membutuhkan: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s membutuhkan %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2073,991 +2182,1026 @@ msgstr "" +@@ -2073,991 +2161,1027 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -67664,43 +69230,43 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -67913,7 +69479,7 @@ index 964c239..35410f6 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -67924,40 +69490,46 @@ index 964c239..35410f6 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -67965,23 +69537,23 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -67995,67 +69567,67 @@ index 964c239..35410f6 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -68064,26 +69636,26 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -68092,62 +69664,62 @@ index 964c239..35410f6 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -68155,79 +69727,79 @@ index 964c239..35410f6 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -68235,118 +69807,118 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -68354,7 +69926,7 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -68362,118 +69934,118 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -68487,7 +70059,7 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -68499,29 +70071,29 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -68529,29 +70101,29 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -68559,117 +70131,117 @@ index 964c239..35410f6 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -68769,10 +70341,15 @@ index 964c239..35410f6 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3066,6 +3210,14 @@ msgstr "" +@@ -3066,6 +3190,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -68784,11 +70361,17 @@ index 964c239..35410f6 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3094,5 +3231,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/it.po b/po/it.po -index 44b6091..4a96f6c 100644 +index 44b6091..039d346 100644 --- a/po/it.po +++ b/po/it.po -@@ -2,13 +2,15 @@ +@@ -2,943 +2,958 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -68797,22 +70380,24 @@ index 44b6091..4a96f6c 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 23:02+0000\n" -+"Last-Translator: guidograzioli \n" - "Language-Team: Italian (http://www.transifex.net/projects/p/yum/team/it/)\n" +-"Language-Team: Italian (http://www.transifex.net/projects/p/yum/team/it/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-13 23:42+0000\n" ++"Last-Translator: Guido Grazioli \n" ++"Language-Team: Italian (http://www.transifex.net/projects/p/yum/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,122 +18,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Aggiornamento" @@ -68823,31 +70408,31 @@ index 44b6091..4a96f6c 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installazione" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Reso obsoleto" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Aggiornato" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Eliminato" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Installato" @@ -68874,7 +70459,7 @@ index 44b6091..4a96f6c 100644 msgstr "Eliminato: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Rimozione in corso" @@ -68884,69 +70469,69 @@ index 44b6091..4a96f6c 100644 msgstr "Pulizia" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Comando \"%s\" già definito" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Settaggio repository" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Lettura dei metadati dei repository dai file locali" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Errore di configurazione: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Errore opzioni: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installato: %s-%s da %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Build : %s su %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Committed: %s su %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "È necessario specificare un comando" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Comando sconosciuto: %s. Eseguire %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Requisiti disco:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Servono almeno altri %dMB sul filesystem %s.\n" @@ -68957,104 +70542,106 @@ index 44b6091..4a96f6c 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -139,60 +143,60 @@ msgstr "" - "Riepilogo errori\n" - "----------------\n" +-msgstr "" +-"Riepilogo errori\n" +-"----------------\n" ++msgstr "Riepilogo errori\n----------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "La transazione non contiene alcuna operazione da eseguire." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Uscita richiesta dall'utente" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Download dei pacchetti:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Errore nel download dei pacchetti:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" -msgstr "" +msgstr "Esecuzione del controllo di transazione" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ERRORE Occorre aggiornare rpm per gestire:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" -msgstr "" +msgstr "ERRORE del controllo di transazione nei confronti di depsolve:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM deve essere aggiornato" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Riportare questo errore su %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Test di transazione in corso" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Errore nel controllo transazione:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Test di transazione eseguito con successo" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Transazione in corso" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -200,237 +204,266 @@ msgstr "" - "L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\n" - "Usare \"-y\" per abilitarla." +-msgstr "" +-"L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\n" +-"Usare \"-y\" per abilitarla." ++msgstr "L'importazione automatica delle chiavi è disabilitata in modalità non interattiva.\nUsare \"-y\" per abilitarla." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Forse si intendeva: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pacchetto %s%s%s disponibile, ma non installato." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Nessun pacchetto %s%s%s disponibile." @@ -69062,7 +70649,7 @@ index 44b6091..4a96f6c 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pacchetto(i) da installare" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -69071,13 +70658,13 @@ index 44b6091..4a96f6c 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Niente da fare" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pacchetti marcati per l'aggiornamento" @@ -69087,12 +70674,12 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetti marcati per l'aggiornamento" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Nessun pacchetto marcato per l'aggiornamento" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pacchetti marcati per la Distribution Synchronization" @@ -69102,12 +70689,12 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetti marcati per la Distribution Synchronization" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Nessun pacchetto marcato per la Distribution Synchronization" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pacchetti marcati per la rimozione" @@ -69117,14 +70704,14 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetto marcati per la rimozione" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Nessun pacchetto marcato per la rimozione" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Downgrade dei pacchetti" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -69132,13 +70719,13 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetti marcati per il downgrade" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (da %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Pacchetto installato %s%s%s%s non disponibile." @@ -69146,7 +70733,7 @@ index 44b6091..4a96f6c 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pacchetto(i) da reinstallare" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -69154,163 +70741,161 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetti da reinstallare" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Nessun pacchetto specificato" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Pacchetto(i) da installare" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" -msgstr "" +msgstr "N/D trovati: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" Ricerca effettuata %ssolamente%s in nome e descrizione breve, usare " -+"\"search all\" per cercare in tutti i campi." +-msgstr "" ++msgstr " Ricerca effettuata %ssolamente%s in nome e descrizione breve, usare \"search all\" per cercare in tutti i campi." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" Ricerca effettuata %ssolamente%s in nome completo e descrizione breve, " -+"usare \"search all\" per cercare in tutti i campi." +-msgstr "" ++msgstr " Ricerca effettuata %ssolamente%s in nome completo e descrizione breve, usare \"search all\" per cercare in tutti i campi." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Trovato: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" -+" Ricerca effettuata %sper lo più%s in nome e descrizione breve, usare " -+"\"search all\" per cercare in tutti i campi." +-msgstr "" ++msgstr " Ricerca effettuata %sper lo più%s in nome e descrizione breve, usare \"search all\" per cercare in tutti i campi." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Attenzione: Nessun pacchetto trovato per: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Nessuna corrispondenza trovata" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nessun pacchetto trovato per %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Pulizia dei repository:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Pulizia completa" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Pulizia header" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Pulizia pacchetti" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Pulizia metadati xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Pulizia cache database" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Pulizia metadati expire-cache" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Pulizia cache di rpmdb" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Pulizia plugin" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "Attenzione: nessun gruppo trovato per: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Gruppi installati:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" -msgstr "" +msgstr "Gruppi lingua installati:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Gruppi disponibili:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" -msgstr "" +msgstr "Gruppi lingua disponibili:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Fatto" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Attenzione: Il gruppo %s non esiste." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 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" +-msgstr "" +-"Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione" +-" o l'aggiornamento" ++msgstr "Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione o l'aggiornamento" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pacchetto(i) da installare" @@ -69320,18 +70905,18 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetti da installare" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Non esiste nessun gruppo con nome %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Nessun pacchetto da rimuovere dai gruppi" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pacchetto(i) da eliminare" @@ -69341,561 +70926,569 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d pacchetti da rimuovere" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Il pacchetto %s è già installato, verrà ignorato" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Esclusione del pacchetto non comparabile %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Nessun altro %s installato, inserimento in lista per potenziale " - "installazione" +-msgstr "" +-"Nessun altro %s installato, inserimento in lista per potenziale " +-"installazione" ++msgstr "Nessun altro %s installato, inserimento in lista per potenziale installazione" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opzioni plugin" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Errore di linea di comando: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -441,284 +474,288 @@ msgstr "" "\n" - "%s: l'opzione %s richiede un argomento" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: l'opzione %s richiede un argomento" ++msgstr "\n\n%s: l'opzione %s richiede un argomento" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color deve specificare uno tra: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot deve essere un percorso assoluto: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "mostra questo messaggio di aiuto ed esce" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "tollera gli errori" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "esegui esclusivamente in cache, senza aggiornarla" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "percorso del file di configurazione" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "tempo massimo di attesa comando" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "livello output di debug" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "mostra i duplicati nei repo, per i comandi list/search" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "livello output per gli errori" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "livello output di debug per rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "modalità silenziosa" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "mostra più messaggi di log" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "risponde si a tutte le domande" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "rispondi no a tutte le domande" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "mostra la versione di yum ed esce" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "imposta la root d'installazione" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "abilita uno o più repository (wildcard consentite)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "disabilita uno o più repository (wildcard consentite)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "esclude pacchetti per nome o glob" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 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:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "disabilita i plugin di Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "disabilita il controllo della firma gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "disabilita i plugin per nome" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "abilita i plugin per nome" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "ignora pacchetti con problemi di risoluzione dipendenze" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" -msgstr "controlla se il colore è usato" +msgstr "imposta l'uso del colore" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "imposta $releasever nella configurazione di yum e nei file dei repo" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "imposta configurazioni arbitrarie e opzioni dei repository" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Gen" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Mag" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Giu" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Lug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Ago" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Set" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Ott" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Dic" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Connessione ad un altro mirror in corso." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Nome : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arch : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoch : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Versione : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Rilascio : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Dimensione : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repo : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Dal repo : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Committer : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Data commit : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Data build : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Data inst. : %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Installato da: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Modificato da: %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Sommario : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licenza : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Descrizione : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "s" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "si" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "no" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Procedere [s/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -727,157 +764,159 @@ msgstr "" - "\n" - "Gruppo: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Gruppo: %s" ++msgstr "\nGruppo: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Id-Gruppo: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Descrizione: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr " Lingua: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Pacchetti necessari:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Pacchetti di default:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "Pacchetti opzionali:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Pacchetti condizionali:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "pacchetto: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Nessuna dipendenza per questo pacchetto" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " dipendenze: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Dipendenza non soddisfatte" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Corrispondenza trovata in:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licenza : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Nome file : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Altro : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" - msgstr "" +-msgstr "" -"Si è verificato un errore nel calcolo della dimensione totale di download" -+"Si è verificato un errore nel calcolo della dimensione totale del download" ++msgstr "Si è verificato un errore nel calcolo della dimensione totale del download" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Dimensione totale: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Dimensione totale del download: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Dimensione installata: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" - msgstr "" - "Si è verificato un errore nel calcolo della dimensione del pacchetto " - "installato" +-msgstr "" +-"Si è verificato un errore nel calcolo della dimensione del pacchetto " +-"installato" ++msgstr "Si è verificato un errore nel calcolo della dimensione del pacchetto installato" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Reinstallazione" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Downgrade" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Installazioni per dipendenze" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Aggiornamenti per dipendenze" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Rimozioni per dipendenze" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Saltato (problemi di dipendenze)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Non installato" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Non disponibile" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Pacchetto" +msgid_plural "Packages" @@ -69903,45 +71496,49 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "Pacchetto" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arch" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versione" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repository" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Dim." -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " in sostituzione di %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -888,57 +927,58 @@ msgstr "" - "Riepilogo della transazione\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Riepilogo della transazione\n" +-"%s\n" ++msgstr "\nRiepilogo della transazione\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installa %5.5s pacchetti\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Install" @@ -69949,7 +71546,7 @@ index 44b6091..4a96f6c 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Aggiorna %5.5s pacchetti\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Upgrade" @@ -69957,7 +71554,7 @@ index 44b6091..4a96f6c 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Elimina %5.5s pacchetti\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Remove" @@ -69965,7 +71562,7 @@ index 44b6091..4a96f6c 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalla %5.5s pacchetti\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Reinstall" @@ -69973,330 +71570,334 @@ index 44b6091..4a96f6c 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Downgrade %5.5s pacchetti\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Downgrade" - --#: ../output.py:1165 -+#: ../output.py:1464 ++ ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Pacchetto dipendente" +msgstr[1] "Pacchetti dipendenti" -+ -+#: ../output.py:1524 + +-#: ../output.py:1165 ++#: ../output.py:1531 msgid "Removed" msgstr "Eliminato" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Dipendenza rimossa" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Dipendenza installata" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Dipendenza aggiornata" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Sostituito" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Fallito" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "due" -@@ -946,7 +986,7 @@ msgstr "due" +@@ -946,579 +961,610 @@ msgstr "due" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -957,365 +997,417 @@ msgstr "" - " Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi\n" - "per uscire.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi\n" +-"per uscire.\n" ++msgstr "\n Download interrotto, %spremi nuovamente (ctrl-c)%s entro %s%s%s secondi\nper uscire.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "interruzione utente" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Totale" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "Ignoro la transazione importata %d a %d, perchè genera conflitti" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "" +msgstr "Nessuna transazione" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "L'ID transazione, o il pacchetto specificato, non è corretto" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "Linea di comando" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Utente loggato" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Data e ora" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Azione/i" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Modifiche" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "ID transazione non specificato" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "L'ID transazione specificato non è corretto" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "L'ID transazione specificato non è stato trovato" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Sono stati trovati ID transazione multipli!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "ID transazione o pacchetto non specificato" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Downgraded" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Meno recente" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Più recente" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "ID transazione :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Ora inizio :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "rpmdb iniziale :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u secondi)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u minuti)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u ore)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u giorni)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Ora termine :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "rpmdb finale :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Utente :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Return-Code : " -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Interrotto" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" -msgstr "" +msgstr "Operazioni fallite:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Errore:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Completato" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Linea di comando :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Informazioni non predefinite addizionali salvate: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transazione eseguita con:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Pacchetti modificati:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Pacchetti ignorati:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problemi di rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Output della scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Errori:" @@ -70305,17 +71906,17 @@ index 44b6091..4a96f6c 100644 -msgstr "Install" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Dep-Install" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Obsoleto" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Eliminato" @@ -70328,303 +71929,319 @@ index 44b6091..4a96f6c 100644 -msgstr "Downgrade" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Update" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Data" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Ultime 24 ore" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Ultima settimana" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Ultime 2 settimane" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Ultimi 3 mesi" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Ultimi 6 mesi" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Ultimi 12 mesi" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Più di un anno" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Transazione %s non trovata" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "ID transazione:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Informazioni addizionali sulla cronologia:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: nessuna informazione addizionale trovata con questo nome" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Pacchetto :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "Stato :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Dimensione :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Build host :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Build time :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Packager :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Vendor :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Licenza :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "RPM sorgente :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Commit Time :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Committer :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Motivo :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Dal repository :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Installato da :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Modficato da :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installato" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" -msgstr "" +msgstr "un aggiornamento" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "eliminato" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "reinstallato" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" -msgstr "" +msgstr "un downgrade" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" -msgstr "" +msgstr "reso obsoleto" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "aggiornato" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "reso obsoleto" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Esecuzione del controllo di transazione" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." +-msgstr "" +-"--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." ++msgstr "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Risoluzione delle dipendenze completata" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Elaborazione dipendenza: %s per il pacchetto: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Pacchetto mantenuto: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dipendenza non risolta: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Pacchetto: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1324,7 +1416,7 @@ msgstr "" - "\n" - " Richiede: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Richiede: %s" ++msgstr "\n Richiede: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1333,7 +1425,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1342,7 +1434,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1351,87 +1443,87 @@ msgstr "" - " Non trovato" +-msgstr "" +-"\n" +-" Non trovato" ++msgstr "\n Non trovato" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Aggiornato da" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Downgraded da" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Reso obsoleto da" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Disponibile" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Analisi conflitto: %s va in conflitto con %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Inizializzazione della transazione con i pacchetti selezionati. " - "Attendere prego." +-msgstr "" +-"--> Inizializzazione della transazione con i pacchetti selezionati. " +-"Attendere prego." ++msgstr "--> Inizializzazione della transazione con i pacchetti selezionati. Attendere prego." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Download dell'header per includere %s nel set di transazione." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Verifica in corso" ++ +#: ../utils.py:129 msgid "Running" msgstr "In esecuzione" @@ -70650,7 +72267,7 @@ index 44b6091..4a96f6c 100644 msgstr "Traced/Interrotto" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Sconosciuto" @@ -70688,36 +72305,47 @@ index 44b6091..4a96f6c 100644 msgid "" "\n" "\n" -@@ -1441,7 +1533,7 @@ msgstr "" - "\n" - "Uscita forzata da utente" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Uscita forzata da utente" ++msgstr "\n\nUscita forzata da utente" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1451,7 +1543,7 @@ msgstr "" - "\n" - "Uscita per broken pipe" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Uscita per broken pipe" ++msgstr "\n\nUscita per broken pipe" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1462,7 +1554,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1470,35 +1562,35 @@ msgstr "" - "Un'altra applicazione sta bloccando l'esecuzione di yum; arresto come " - "configurato da exit_on_lock" +-msgstr "" +-"Un'altra applicazione sta bloccando l'esecuzione di yum; arresto come " +-"configurato da exit_on_lock" ++msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; arresto come configurato da exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -70758,9 +72386,10 @@ index 44b6091..4a96f6c 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1506,19 +1598,19 @@ msgstr "" - "\n" - "Dipendenze risolte" +-msgstr "" +-"\n" +-"Dipendenze risolte" ++msgstr "\nDipendenze risolte" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 @@ -70781,9 +72410,25 @@ index 44b6091..4a96f6c 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1548,53 +1640,53 @@ msgstr "" +@@ -1533,585 +1579,592 @@ msgid "" + "will install it for you.\n" "\n" - "Per altre informazioni contattare il supporto della distribuzione.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Il controllo dei pacchetti via chiavi GPG è abilitato. Ottima scelta.\n" +-"Tuttavia, non ci sono chiavi pubbliche GPG installate: è necessario scaricare\n" +-"installare le chiavi dei repository che si desidera utilizzare.\n" +-"Per importare una chiave pubblica GPG eseguire il comando:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"In alternativa è possibile specificare gli indirizzi delle chiavi dei\n" +-"repository nell'opzione 'gpgkey' dei relativi file di configurazione; yum\n" +-"le installerà automaticamente.\n" +-"\n" +-"Per altre informazioni contattare il supporto della distribuzione.\n" ++msgstr "\nIl controllo dei pacchetti via chiavi GPG è abilitato. Ottima scelta.\nTuttavia, non ci sono chiavi pubbliche GPG installate: è necessario scaricare\ninstallare le chiavi dei repository che si desidera utilizzare.\nPer importare una chiave pubblica GPG eseguire il comando:\n rpm --import public.gpg.key\n\n\nIn alternativa è possibile specificare gli indirizzi delle chiavi dei\nrepository nell'opzione 'gpgkey' dei relativi file di configurazione; yum\nle installerà automaticamente.\n\nPer altre informazioni contattare il supporto della distribuzione.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -70847,9 +72492,12 @@ index 44b6091..4a96f6c 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1604,307 +1696,296 @@ msgstr "" - " Eseguire \"yum repolist all\" per vedere la lista dei repository.\n" - " E' possibile abilitare i repository desiderati con yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Non ci sono repository abilitati.\n" +-" Eseguire \"yum repolist all\" per vedere la lista dei repository.\n" +-" E' possibile abilitare i repository desiderati con yum-config-manager --enable " ++msgstr "Non ci sono repository abilitati.\n Eseguire \"yum repolist all\" per vedere la lista dei repository.\n E' possibile abilitare i repository desiderati con yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -70994,8 +72642,9 @@ index 44b6091..4a96f6c 100644 -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "L'operazione impiegherà del tempo che dipende dalla velocità del computer" +-msgstr "" +-"L'operazione impiegherà del tempo che dipende dalla velocità del computer" ++msgstr "L'operazione impiegherà del tempo che dipende dalla velocità del computer" -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -71083,120 +72732,120 @@ index 44b6091..4a96f6c 100644 msgstr "Mostra i repository di software configurati" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "abilitato" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "disabilitato" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Id-Repo : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Nome-Repo : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Stato-Repo : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Revisione-Repo: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Dim.-Repo : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Aggiornato :" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Mai (ultimo: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Istantaneo (ultimo: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s secondi (ultimo: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-include :" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Repo-excluded: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Repo-filename: " @@ -71204,191 +72853,197 @@ index 44b6091..4a96f6c 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "id repo" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "stato" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "nome repo" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Mostra un'utile guida all'uso" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Nessun aiuto disponibile per %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1914,7 +1995,7 @@ msgstr "" - "\n" - "alias: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1924,117 +2005,167 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Impostazione processo di reinstallazione" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "Reinstalla un pacchetto" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Impostazione processo di downgrade" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "Esegue il downgrade di un pacchetto" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Mostra una versione del sistema e/o dei repo disponibili." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Gruppi della versione di yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Gruppo :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Pacchetti:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Installato:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Group-Installed:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Disponibile:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Group-Available:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Visualizza e gestisci la cronologia delle transazioni" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Transazioni :" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Ora inizio :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Ora fine :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Conteggio :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Sotto comando per history non valido, usare: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Non si dispone dell'accesso alla cronologia." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Identifica gli errori nell'rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "" +msgstr "carica una transazione salvata da un file" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nessun file specificato per la transazione salvata." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "caricamento transazione da %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -71398,30 +73053,30 @@ index 44b6091..4a96f6c 100644 #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +-msgstr "" +msgstr " Controlli Yum falliti: %s" -+ + +-#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "" +-"Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che " +-"esca..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" - msgstr "" -+"Non si hanno i diritti di read/execute nella directory corrente, viene usata" -+" /" ++msgstr "Non si hanno i diritti di read/execute nella directory corrente, viene usata /" --#: ../yummain.py:114 +-#: ../yummain.py:120 +#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" + msgid "Can't create lock file; exiting" +-msgstr "" +msgstr "Impossibile creare il file di lock; uscita" + +#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che " - "esca..." ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che esca..." --#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -71432,297 +73087,305 @@ index 44b6091..4a96f6c 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" +-msgstr "" +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" - msgstr "" -+"La transazione è stata salvata, per eseguirla nuovamente:\n" -+" yum load-transaction %s" ++msgstr "La transazione è stata salvata, per eseguirla nuovamente:\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2044,74 +2175,74 @@ msgstr "" - "\n" - "Uscita su richiesta utente." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Uscita su richiesta utente." ++msgstr "\n\nUscita su richiesta utente." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() verrà eliminato in una futura versione di yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Impostazione del TransactionSets prima che sia attivo config class" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag non valido nel file di configurazione: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" -msgstr "Ricerca di pkgSack per dip: %s" +msgstr "Ricerca nel pkgSack per dip: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Membro: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s convertito in installazione" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Aggiunto il pacchetto %s in modo %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Rimozione pacchetto %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s richiede: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s richiede %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Il requisito necessario è già stato controllato, imbroglio" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Il requisito necessario non è il nome di un pacchetto. Ricerca di: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Provider potenziale: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "La modalità è %s per il provider di %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modalità per il pacchetto che fornisce %s: %s" -@@ -2119,120 +2250,121 @@ msgstr "Modalità per il pacchetto che fornisce %s: %s" +@@ -2119,1036 +2172,1029 @@ msgstr "Modalità per il pacchetto che fornisce %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Tentativo di aggiornare %s per risolvere una dipendenza" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" - msgstr "" -+"Nessun percorso di aggiornamento trovato per %s. Aggiornamento fallito!" +-msgstr "" ++msgstr "Nessun percorso di aggiornamento trovato per %s. Aggiornamento fallito!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, 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:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: Verrà reso obsoleto %s sostituendolo con %s per risolvere una " - "dipendenza." +-msgstr "" +-"TSINFO: Verrà reso obsoleto %s sostituendolo con %s per risolvere una " +-"dipendenza." ++msgstr "TSINFO: Verrà reso obsoleto %s sostituendolo con %s per risolvere una dipendenza." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Aggiornamento di %s per risolvere dip." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" - msgstr "" - "Impossibile trovare un percorso di aggiornamento delle dipendenze per: %s" +-msgstr "" +-"Impossibile trovare un percorso di aggiornamento delle dipendenze per: %s" ++msgstr "Impossibile trovare un percorso di aggiornamento delle dipendenze per: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Individuato %s come requisito per %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s è nei pacchetti fornitori ma è già installato, viene rimosso." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "Il potenziale pacchetto risolutore %s ha già una più recente istanza in ts." +-msgstr "" +-"Il potenziale pacchetto risolutore %s ha già una più recente istanza in ts." ++msgstr "Il potenziale pacchetto risolutore %s ha già una più recente istanza in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." - msgstr "" - "Il potenziale pacchetto risolutore %s ha una più recente istanza già " - "installata." +-msgstr "" +-"Il potenziale pacchetto risolutore %s ha una più recente istanza già " +-"installata." ++msgstr "Il potenziale pacchetto risolutore %s ha una più recente istanza già installata." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s è gia nel set delle transazioni (ts), verrà saltato" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s marcato come aggiornamento per %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: %s marcato come da installare per %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Successo - transazione vuota" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Riavvio del ciclo" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Elaborazione delle dipendenze terminata" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Successo - dipendenze risolte" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Controllo delle dipendenze per %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "ricerca di %s come requisito di %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Esecuzione di compare_providers() per %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "migliore architettura in po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s rende obsoleto %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2241,143 +2373,143 @@ msgstr "" - "archdist ha comparato %s a %s su %s\n" - " Vincitore: %s" + " Winner: %s" +-msgstr "" +-"archdist ha comparato %s a %s su %s\n" +-" Vincitore: %s" ++msgstr "archdist ha comparato %s a %s su %s\n Vincitore: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "sourcerpm comune %s e %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "il pacchetto base %s è installato per %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefisso comune di %s tra %s e %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr " richiede almeno: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Vincitore: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Perdente (con %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Ordine migliore: %s" @@ -71742,8 +73405,9 @@ index 44b6091..4a96f6c 100644 +#: ../yum/__init__.py:533 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "Nella configurazione non è presente il nome del repo %r, viene usato l'id" +-msgstr "" +-"Nella configurazione non è presente il nome del repo %r, viene usato l'id" ++msgstr "Nella configurazione non è presente il nome del repo %r, viene usato l'id" -#: ../yum/__init__.py:526 +#: ../yum/__init__.py:571 @@ -71856,9 +73520,10 @@ index 44b6091..4a96f6c 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2385,21 +2517,21 @@ msgstr "" - "Ci sono transazioni non completate. Si consiglia di eseguire prima yum-" - "complete-transaction per portarle a termine." +-msgstr "" +-"Ci sono transazioni non completate. Si consiglia di eseguire prima yum-" +-"complete-transaction per portarle a termine." ++msgstr "Ci sono transazioni non completate. Si consiglia di eseguire prima yum-complete-transaction per portarle a termine." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -71884,9 +73549,10 @@ index 44b6091..4a96f6c 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2407,89 +2539,92 @@ msgstr "" - "\n" - "Pacchetti ignorati a causa di problemi di dipendenze:" +-msgstr "" +-"\n" +-"Pacchetti ignorati a causa di problemi di dipendenze:" ++msgstr "\nPacchetti ignorati a causa di problemi di dipendenze:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -71899,8 +73565,9 @@ index 44b6091..4a96f6c 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Trovati %d problemi pre-esistenti nel rpmdb, l'output di 'yum check' è:" +-msgstr "" +-"** Trovati %d problemi pre-esistenti nel rpmdb, l'output di 'yum check' è:" ++msgstr "** Trovati %d problemi pre-esistenti nel rpmdb, l'output di 'yum check' è:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -71921,9 +73588,10 @@ index 44b6091..4a96f6c 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Attenzione: durante la transazione si sono verificati errori di scriptlet o " - "altri errori non fatali." +-msgstr "" +-"Attenzione: durante la transazione si sono verificati errori di scriptlet o " +-"altri errori non fatali." ++msgstr "Attenzione: durante la transazione si sono verificati errori di scriptlet o altri errori non fatali." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -71945,7 +73613,7 @@ index 44b6091..4a96f6c 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s doveva essere installato, ma non sembra esserlo!" @@ -71956,24 +73624,22 @@ index 44b6091..4a96f6c 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s doveva essere eliminato, ma non lo è stato!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Impossibile creare il lock su %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Impossibile creare il lock su %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Non è possibile controllare se il PID %s è attivo" - +-#, 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:1789 +#: ../yum/__init__.py:1917 @@ -71983,38 +73649,52 @@ index 44b6091..4a96f6c 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Impossibile creare il lock su %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Impossibile creare il lock su %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Non è possibile controllare se il PID %s è attivo" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2498,40 +2633,29 @@ msgstr "" - "Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire " - "yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire " +-"yum --enablerepo=%s clean metadata" ++msgstr "Il pacchetto non corrisponde al download desiderato. Suggerimento: eseguire yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Non è stato possibile calcolare il checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Il pacchetto non corrisponde al checksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, 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:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "utilizzo di una copia locale di %s" @@ -72031,69 +73711,70 @@ index 44b6091..4a96f6c 100644 -" * necessario %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "L'header non è completo." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2539,62 +2663,64 @@ msgstr "" - "Header non presente in cache locale e modalità solo-cache abilitata. " - "Impossibile scaricare %s" +-msgstr "" +-"Header non presente in cache locale e modalità solo-cache abilitata. " +-"Impossibile scaricare %s" ++msgstr "Header non presente in cache locale e modalità solo-cache abilitata. Impossibile scaricare %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "La chiave pubblica per %s non è installata" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problemi nell'apertura di %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "La chiave pubblica per %s non è trusted" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Il pacchetto %s non è firmato" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Non posso rimuovere %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s eliminato" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Impossibile rimuovere %s file %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s file %s rimosso" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s file rimossi" @@ -72103,28 +73784,29 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "%d %s file rimossi" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Più di una corrispondenza identica nel sack per %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nessuna corrispondenza per %s.%s %s:%s-%s dall'aggiornamento" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2602,121 +2728,126 @@ msgstr "" - "searchPackages() verrà eliminato in una futura versione di yum. In " - "sostituzione usare searchGenerator(). \n" +-msgstr "" +-"searchPackages() verrà eliminato in una futura versione di yum. In " +-"sostituzione usare searchGenerator(). \n" ++msgstr "searchPackages() verrà eliminato in una futura versione di yum. In sostituzione usare searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Ricerca dei pacchetti %d" @@ -72134,213 +73816,216 @@ index 44b6091..4a96f6c 100644 +msgstr[1] "Ricerca di %d pacchetti" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "ricerca del pacchetto %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "ricerca nelle file entries" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "ricerca nelle provides entries" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Non ci sono informazioni sui gruppi per i repository configurati" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Il gruppo %s non esiste" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "il pacchetto %s non è stato contrassegnato nel gruppo %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Aggiunta del pacchetto %s dal gruppo %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Nessun pacchetto con nome %s disponibile per l'installazione" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Attenzione: il gruppo %s non contiene alcun pacchetto." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." - msgstr "" -+"Il gruppo %s contiene %u pacchetti facoltativi, che potrebbero essere " -+"installati." +-msgstr "" ++msgstr "Il gruppo %s contiene %u pacchetti facoltativi, che potrebbero essere installati." #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Il pacchetto con tupla %s non è stato trovato nel packagesack" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Il pacchetto con tupla %s non è stato trovato nel rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "Flag di versione non valido da: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Nessun pacchetto trovato per %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Package Object non è un'istanza di un oggetto package" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Non è specificato niente da installare" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Controllo dei virtual provide o file-provide per %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Nessuna corrispondenza per l'argomento: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Il pacchetto %s è installato e non disponibile" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Nessun pacchetto disponibile per l'installazione" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pacchetto: %s - già nel set di transazione" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Il pacchetto %s è reso obsoleto da %s, che è già installato" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2725,85 +2856,91 @@ msgstr "" - "Il pacchetto %s è reso obsoleto da %s, ma quest'ultimo non fornisce i " - "provide richiesti" + "requirements" +-msgstr "" +-"Il pacchetto %s è reso obsoleto da %s, ma quest'ultimo non fornisce i " +-"provide richiesti" ++msgstr "Il pacchetto %s è reso obsoleto da %s, ma quest'ultimo non fornisce i provide richiesti" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " - "posto" +-msgstr "" +-"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo " +-"posto" ++msgstr "Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Il pacchetto %s è già installato e aggiornato all'ultima versione" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Il pacchetto corrispondente a %s è già installato. Controllo aggiornamenti." +-msgstr "" +-"Il pacchetto corrispondente a %s è già installato. Controllo aggiornamenti." ++msgstr "Il pacchetto corrispondente a %s è già installato. Controllo aggiornamenti." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Aggiornamento completo" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Il pacchetto obsoleto non verrà aggiornato: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Nessun pacchetto trovato per l'aggiornamento: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Il pacchetto era già obsoleto: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Il pacchetto obsoleto non verrà aggiornato: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Il pacchetto è già aggiornato: %s.%s %s:%s-%s" @@ -72348,422 +74033,420 @@ index 44b6091..4a96f6c 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nessun pacchetto selezionato per l'eliminazione" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Nessun pacchetto trovato per la rimozione: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Ignoro il kernel in esecuzione: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Rimozione di %s dalla transazione" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Impossibile aprire: %s. Verrà ignorato." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Analisi di %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "localinstall del deltarpm fallito: %s. Verrà ignorato." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2811,14 +2948,14 @@ msgstr "" - "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non " - "compatibile: %s" +-msgstr "" +-"Impossibile aggiungere il pacchetto %s alla transazione. Architettura non " +-"compatibile: %s" ++msgstr "Impossibile aggiungere il pacchetto %s alla transazione. Architettura non compatibile: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Impossibile installare il pacchetto %s. E' reso obsoleto dal pacchetto " - "installato %s" +-msgstr "" +-"Impossibile installare il pacchetto %s. E' reso obsoleto dal pacchetto " +-"installato %s" ++msgstr "Impossibile installare il pacchetto %s. E' reso obsoleto dal pacchetto installato %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2827,141 +2964,161 @@ msgstr "" - "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire" - " yum install per installarlo." + "instead." +-msgstr "" +-"Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire" +-" yum install per installarlo." ++msgstr "Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire yum install per installarlo." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." - msgstr "" -+"Il pacchetto %s.%s non è installato, non è quindi possibile aggiornarlo. " -+"Eseguire yum install se si desidera installarlo." +-msgstr "" ++msgstr "Il pacchetto %s.%s non è installato, non è quindi possibile aggiornarlo. Eseguire yum install se si desidera installarlo." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Esclusione di %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s contrassegnato per l'installazione" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "%s contrassegnato come aggiornamento di %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: non aggiorna il pacchetto installato." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Impossibile aprire il file: %s. Verrà ignorato." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Problema nella reinstallazione: nessun pacchetto corrispondente per la " - "rimozione" +-msgstr "" +-"Problema nella reinstallazione: nessun pacchetto corrispondente per la " +-"rimozione" ++msgstr "Problema nella reinstallazione: nessun pacchetto corrispondente per la rimozione" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Problema nella reinstallazione: nessun pacchetto corrispondente a %s per " - "l'installazione" +-msgstr "" +-"Problema nella reinstallazione: nessun pacchetto corrispondente a %s per " +-"l'installazione" ++msgstr "Problema nella reinstallazione: nessun pacchetto corrispondente a %s per l'installazione" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Nessun pacchetto disponibile per il downgrade" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Il pacchetto %s permette installazioni multiple, lo salto" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Nessuna corrispondenza per il pacchetto disponibile: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Solo l'upgrade è disponibile per il pacchetto: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Downgrade fallito: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Errore nell'upgrade: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" -msgstr "" +msgstr "Recupero chiave da %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Recupero chiave GPG fallito: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" -+"La firma della chiave GPG %s non corrisponde alla chiave della CA per il " -+"repository: %s" +-msgstr "" ++msgstr "La firma della chiave GPG %s non corrisponde alla chiave della CA per il repository: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "Verifica della firma della chiave GPG con la chiave della CA fallita " -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Chiave GPG non valida da %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Analisi chiave GPG fallita: la chiave non ha il valore %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" +-msgstr "" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" Package : %s (%s)\n" +" From : %s" - msgstr "" -+"Importazione della chiave %s 0x%s:\n" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" Pacchetto : %s (%s)\n" -+" Da : %s" ++msgstr "Importazione della chiave %s 0x%s:\n Userid : \"%s\"\n Fingerprint: %s\n Pacchetto : %s (%s)\n Da : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" +-msgstr "" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" - msgstr "" -+"Importazione della chiave %s 0x%s:\n" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" Da : %s" ++msgstr "Importazione della chiave %s 0x%s:\n Userid : \"%s\"\n Fingerprint: %s\n Da : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Chiave GPG in %s (0x%s) già installata" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Importazione chiave fallita (codice %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Chiave importata correttamente" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" -msgstr "" +msgstr "Non è stata installata alcuna chiave" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2970,25 +3127,25 @@ msgstr "" - "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per questo pacchetto.\n" - "Controllare che gli URL delle chiavi di questo repository siano configurati correttamente." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per questo pacchetto.\n" +-"Controllare che gli URL delle chiavi di questo repository siano configurati correttamente." ++msgstr "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette per questo pacchetto.\nControllare che gli URL delle chiavi di questo repository siano configurati correttamente." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Importazione delle chiavi non sufficiente, chiave sbagliata?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Chiave GPG in %s (0x%s) è già stata importata" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Importazione chiave fallita" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Non è stata installata alcuna chiave per il repository %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2997,158 +3154,189 @@ msgstr "" - "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette.\n" - "Controllare che gli URL delle chiavi di questo repository siano configurati correttamente." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette.\n" +-"Controllare che gli URL delle chiavi di questo repository siano configurati correttamente." ++msgstr "Le chiavi GPG elencate per il repository \"%s\" sono attualmente installate ma non sono corrette.\nControllare che gli URL delle chiavi di questo repository siano configurati correttamente." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Impossibile trovare un mirror adatto." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Si sono verificati degli errori durante il download dei pacchetti." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Riportare questo errore su %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Errori nel test di transazione: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Impossibile impostare la cachedir: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" -+"Dipendenze non risolte. La transazione con dipendenze non risolte non verrà " -+"salvata." +-msgstr "" ++msgstr "Dipendenze non risolte. La transazione con dipendenze non risolte non verrà salvata." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "Impossibile salvare il file di transazione %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Impossibile accedere/leggere la transazione salvata %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " - msgstr "" -+"la versione di rpmdb non corrisponde alla versione della transazione " -+"salvata, " +-msgstr "" ++msgstr "la versione di rpmdb non corrisponde alla versione della transazione salvata, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." -msgstr "" +msgstr " ignorato, come richiesto." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." -msgstr "" +msgstr " esecuzione annullata." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "impossibile trovare tsflags o tsflags non intero." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "Membro di transazione trovato in stato attuale sconosciuto: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "Impossibile trovare il membro di transazione: %s in stato %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Impossibile trovare il membro di transazione: %s dall'origine: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," - msgstr "" -+"Membri della transazione, ci sono relazioni mancanti oppure ts è stata " -+"modificata," +-msgstr "" ++msgstr "Membri della transazione, ci sono relazioni mancanti oppure ts è stata modificata," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" - msgstr "" -+" ignorati, come richiesto. E' necessario eseguire nuovamente depsolve." +-msgstr "" ++msgstr " ignorati, come richiesto. E' necessario eseguire nuovamente depsolve." + +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s è già stato visitato e non può essere rimossi." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Esame delle revdeps di %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s ha la revdep %s che è stata installata dall'utente." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s non ha revdeps installate dall'utente." @@ -72815,8 +74498,9 @@ index 44b6091..4a96f6c 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Esiste più di un plugin con nome \"%s\" nel percorso di ricerca dei plugin" +-msgstr "" +-"Esiste più di un plugin con nome \"%s\" nel percorso di ricerca dei plugin" ++msgstr "Esiste più di un plugin con nome \"%s\" nel percorso di ricerca dei plugin" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -72864,57 +74548,80 @@ index 44b6091..4a96f6c 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s fornisce %s, ma non è stato possibile trovarlo" -@@ -3157,6 +3345,17 @@ msgstr "%s fornisce %s, ma non è stato possibile trovarlo" +@@ -3157,6 +3203,19 @@ msgstr "%s fornisce %s, ma non è stato possibile trovarlo" msgid "Repackaging" msgstr "Reimpacchettamento" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Verifica: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Spazio insufficiente nella cartella di download %s\n" -+" * libero %s\n" -+" * necessario %s" ++msgstr "Spazio insufficiente nella cartella di download %s\n * libero %s\n * necessario %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3169,8 +3228,7 @@ msgstr "Controllo md5 dell'RPM %s fallito" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Non è stato possibile aprire in lettura il database RPM. Forse è gia in uso?" ++msgstr "Non è stato possibile aprire in lettura il database RPM. Forse è gia in uso?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3186,5 +3244,3 @@ msgstr "Header %s danneggiato" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Errore nell'apertura dell'rpm %s - errore %s" +- +- diff --git a/po/ja.po b/po/ja.po -index a232b0c..c9549cf 100644 +index a232b0c..3161864 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -2,14 +2,16 @@ +@@ -2,935 +2,950 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Hajime Taira , 2011 +# Translators: +# Hajime Taira , 2011. ++# Tadashi Jokagi , 2012. +# Tadashi Jokagi , 2011. ++# Tomoyuki KATO , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" -+"Last-Translator: james \n" - "Language-Team: Japanese (http://www.transifex.net/projects/p/yum/team/ja/)\n" +-"Language-Team: Japanese (http://www.transifex.net/projects/p/yum/team/ja/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2012-02-14 18:08+0000\n" ++"Last-Translator: Tadashi Jokagi \n" ++"Language-Team: Japanese (http://www.transifex.net/projects/p/yum/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +19,123 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" - msgstr "更新" +-msgstr "更新" ++msgstr "更新中" -#: ../callback.py:49 ../yum/rpmtrans.py:74 +#: ../callback.py:46 ../yum/rpmtrans.py:74 @@ -72923,31 +74630,32 @@ index a232b0c..c9549cf 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" - msgstr "インストールしています" +-msgstr "インストールしています" ++msgstr "インストール中" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "不要" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "更新" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "削除" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "インストール" @@ -72974,9 +74682,10 @@ index a232b0c..c9549cf 100644 msgstr "削除しました: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" - msgstr "削除" +-msgstr "削除" ++msgstr "削除中" -#: ../callback.py:219 ../yum/rpmtrans.py:79 +#: ../callback.py:231 ../yum/rpmtrans.py:79 @@ -72984,69 +74693,69 @@ index a232b0c..c9549cf 100644 msgstr "整理中" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "コマンド「%s」はすでに定義済みです" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "リポジトリーの設定" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "設定エラー: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "オプションエラー: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "インストール: %s-%s (日時: %s)" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " 構築 : %s (日時: %s)" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " コミット : %s (日時: %s)" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "いくつかのコマンドを指定する必要があります" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "コマンド「%s」が見つかりません。「%s --help」を実行してください。" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "ディスク要求:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " 少なくとも %dMB の空き容量がファイルシステム %s で必要です。\n" @@ -73056,100 +74765,101 @@ index a232b0c..c9549cf 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,292 +143,307 @@ msgstr "" - "エラーの要約\n" - "-------------\n" +-msgstr "" +-"エラーの要約\n" +-"-------------\n" ++msgstr "エラーの要約\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "トランザクションの実行を試みましたが、何もありませんでした。終了します。" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "ユーザーコマンドを終了しています" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "パッケージをダウンロードしています:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "パッケージのダウンロードでエラー:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "トランザクションのチェックを実行してします。" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "エラー: RPM の更新のためのハンドルを更新する必要があります" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "更新には RPM が必要です" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "%s にこのエラーを報告してください" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "トランザクションのテストを実行しています" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "トランザクションの確認エラー\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "トランザクションのテストを成功しました" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "トランザクションを実行しています" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * おそらくの意味: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "パッケージ %s%s%s は利用できません。" @@ -73157,78 +74867,78 @@ index a232b0c..c9549cf 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "インストールするパッケージ" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "" ++msgstr[0] "インストールする %d 個のパッケージ" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "何もしません" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d 個のパッケージが更新の設定しました。" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "" ++msgstr[0] "%d 個のパッケージが更新として印がつけられました" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "更新と設定されたパッケージがありません。" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d 個のパッケージを同期配信に設定しました。" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "" ++msgstr[0] "%d 個のパッケージがディストリビューション同期として印がついています" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "パッケージが同期配信に設定したパッケージはありません。" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d 個のパッケージを削除に設定しました。" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "" ++msgstr[0] "%d 個のパッケージが削除として印がつけられました" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "削除と設定したパッケージはありません。" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "ダウングレードするパッケージ" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "" ++msgstr[0] "ダウングレードする %d 個のパッケージ" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (%s から)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "インストール済みパッケージ %s%s%s%s は利用できません。" @@ -73236,782 +74946,795 @@ index a232b0c..c9549cf 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "再インストールするパッケージ" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "" ++msgstr[0] "再インストールする %d 個のパッケージ" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "パッケージが提供されていません。" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "インストールするパッケージ" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "一致: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "警告: 一致するものが見つかりません: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "見つかりませんでした" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "%s のパッケージが見つかりません" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "リポジトリーを清掃しています: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "すべて掃除しています" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "ヘッダーを掃除しています" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "パッケージを掃除しています" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "XML メタデータを掃除しています" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "データベースキャッシュを掃除しています" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "期限切れのメタデータキャッシュを掃除しています" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "キャッシュ済み rpmdb データを掃除しています" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "プラグインを掃除しています" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "警告: 一致するグループがありません: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "インストール済みグループ:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" -msgstr "" +msgstr "インストール済みの言語グループ:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "利用可能なグループ" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" -msgstr "" +msgstr "利用できる言語グループ:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "完了" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "警告: グループ %s が存在しません。" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "インストールまたは更新に利用できるいくつかの要求されたグループにパッケージがありません" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d 個のパッケージをインストールします" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "" ++msgstr[0] "インストールする %d 個のパッケージ" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "グループ名 %s が存在しません" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "グループから削除するパッケージがありません" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d 個のパッケージを削除します" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "" ++msgstr[0] "削除する %d 個のパッケージ" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "パッケージ %s は既にインストールされているので飛ばします" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "非互換のパッケージ %s.%s を破棄しています" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "プラグインのオプション" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "コマンドライン エラー: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -436,284 +454,288 @@ msgstr "" "\n" - "%s: オプション %s は引数が必要です " + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: オプション %s は引数が必要です " ++msgstr "\n\n%s: オプション %s は引数が必要です " -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color がとることができる値な次のうちひとつです: auto、always、never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot は絶対パスでなければなりません: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "このヘルプ メッセージを表示して終了する" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "エラーを黙認する" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "キャッシュから完全に実行し、キャッシュを更新しません" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "構成ファイルの場所" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "コマンドの最大待ち時間" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "デバッグ情報の出力レベル" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "一覧/検索コマンドのリポジトリーの重複の表示" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "エラー出力レベル" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "rpm のデバッグ情報の出力レベル" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "静かに処理をする" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "冗長に処理をする" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "すべての問い合わせに「yes」で答える" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" -+msgstr "" ++msgstr "すべての質問にいいえを回答します" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "Yum のバージョンを表示して終了する" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "インストールのベース ディレクトリーを設定する" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "名前かワイルドカードでパッケージを除外する" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "main、あるリポジトリー、またはすべてからの除外を無効にします。" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "更新中に不要な処理を有効にします" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "Yum プラグインを無効にする" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "GPG 署名の確認を無効にする" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "名前でプラグインを無効にする" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "名前でプラグインを有効にする" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "依存性に問題があるパッケージを飛ばす" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "色を使うかどうか制御する" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "yum 設定と repo ファイルに $releasever の値を設定する" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "全体設定とリポジトリー オプションの任意に設定する" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "1 月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "2 月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "3 月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "4 月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "5 月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "6 月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "7 月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "8 月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "9 月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "10 月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "11 月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "12 月" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "他のミラーを試します。" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "名前 : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "アーキテクチャ : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "エポック : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "バージョン : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "リリース : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "容量 : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "リポジトリー : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "提供元リポジトリー : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "コミット者 : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "コミット日時 : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "ビルド日時 : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "インストール日時 : %s " -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "インストール済み容量: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "変更者 : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "要約 : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "ライセンス : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "説明 : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "はい" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "いいえ" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "これでいいですか? [y/N]" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -722,154 +744,155 @@ msgstr "" - "\n" - "グループ: %s" + "Group: %s" +-msgstr "" +-"\n" +-"グループ: %s" ++msgstr "\nグループ: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " グループ ID: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " 説明: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr " 言語: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " 強制的なパッケージ:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " 標準パッケージ:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " オプション パッケージ:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " 条件付パッケージ:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "パッケージ : %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " このパッケージの依存はありません" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " 依存性 : %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " 満たされていない依存性" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "一致 :" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "ライセンス : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "ファイル名 : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "その他 : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "総ダウンロード容量の計算中にエラーです。" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "合計容量: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "総ダウンロード容量: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "インストール済み容量: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "インストール容量の計算中にエラーです。" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "再インストール中" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "ダウングレード中" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" - msgstr "依存性関連でのインストールをします。" +-msgstr "依存性関連でのインストールをします。" ++msgstr "依存性関連でのインストールをします" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" - msgstr "依存性関連での更新をします。" +-msgstr "依存性関連での更新をします。" ++msgstr "依存性関連での更新をします" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" - msgstr "依存性関連での削除をします。" +-msgstr "依存性関連での削除をします。" ++msgstr "依存性関連での削除をします" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "飛ばしました (依存性の問題)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "未インストール" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "利用できません" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "パッケージ" +msgid_plural "Packages" +msgstr[0] "パッケージ" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "アーキテクチャ" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "バージョン" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "リポジトリー" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "容量" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " 置き換えています %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -880,57 +903,57 @@ msgstr "" - "トランザクションの要約\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"トランザクションの要約\n" +-"%s\n" ++msgstr "\nトランザクションの要約\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "インストール %5.5s パッケージ\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "インストール" @@ -74019,23 +75742,23 @@ index a232b0c..c9549cf 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "アップグレード %5.5s パッケージ\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" -+msgstr "" ++msgstr "更新" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "削除 %5.5s パッケージ\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" -+msgstr "" ++msgstr "削除" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "再インストール %5.5s パッケージ\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "再インストール" @@ -74043,328 +75766,331 @@ index a232b0c..c9549cf 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "ダウングレード %5.5s パッケージ\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "ダウングレード" -+ -+#: ../output.py:1464 -+msgid "Dependent package" -+msgid_plural "Dependent packages" -+msgstr[0] "" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1471 ++msgid "Dependent package" ++msgid_plural "Dependent packages" ++msgstr[0] "依存するパッケージ" ++ ++#: ../output.py:1531 msgid "Removed" msgstr "削除しました" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "依存性の削除をしました" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "依存性関連をインストールしました" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "依存性を更新しました" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "置換" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "失敗" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "2" -@@ -938,7 +961,7 @@ msgstr "2" +@@ -938,561 +953,598 @@ msgstr "2" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -948,364 +971,416 @@ msgstr "" - "\n" - "現在のダウンロードをキャンセルしました。終了するには %s再度割り込み ([Ctrl][C]キー)%s を %s%s%s 秒以内に押してください。\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-"現在のダウンロードをキャンセルしました。終了するには %s再度割り込み ([Ctrl][C]キー)%s を %s%s%s 秒以内に押してください。\n" ++msgstr "\n現在のダウンロードをキャンセルしました。終了するには %s再度割り込み ([Ctrl][C]キー)%s を %s%s%s 秒以内に押してください。\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "ユーザーの割り込み" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "合計" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "<未設定>" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "システム" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "" +msgstr "トランザクションがありません" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "指定されたトランザクション ID、またはパッケージがおかしいです" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "コマンドライン" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "ログイン ユーザー" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "日時" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "操作" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "変更" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "指定されたトランザクション ID がありません。" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "指定されたトランザクション ID がおかしいです" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "指定されたトランザクション ID が見つかりません" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "ひとつ以上のトランザクション ID が見つかりません!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "指定されたトランザクション ID、またはパッケージが見つかりません。" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "ダウングレード済み" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "より古い" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "より新しい" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "トランザクション ID :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "開始時間 :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "開始 rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u 秒)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u 分)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u 時間)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u 日)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "終了時間 :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "終了 rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "ユーザー :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "終了コード :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "中断しました" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" -msgstr "" +msgstr "失敗:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "失敗しました:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "成功" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "コマンドライン :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "保存済みの追加の非標準な情報: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "トランザクションの実行:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "切り替えたパッケージ:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "パッケージを飛ばします:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb の問題:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "スクリプトの出力:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "エラー:" @@ -74373,17 +76099,17 @@ index a232b0c..c9549cf 100644 -msgstr "インストール" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "依存インストール" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "不要削除" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "削除" @@ -74396,296 +76122,314 @@ index a232b0c..c9549cf 100644 -msgstr "ダウングレード" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "更新" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "時間" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "昨日" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "先週" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "最近の 2 週間" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "最近の 3 ヶ月間" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "最近の 6 ヶ月間" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "昨年" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "1 年以上前" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "トランザクション %s が見つかりません。" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "トランザクション ID:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "追加の履歴情報が利用できます:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: この名前から追加のデータが見つかりません。" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" -+msgstr "" ++msgstr "パッケージ :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" -+msgstr "" ++msgstr "状態 :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" -+msgstr "" ++msgstr "容量 :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" -+msgstr "" ++msgstr "構築ホスト :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" -+msgstr "" ++msgstr "構築日時 :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" -+msgstr "" ++msgstr "パッケージ者 :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" -+msgstr "" ++msgstr "ベンダー :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" -+msgstr "" ++msgstr "ライセンス :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" -+msgstr "" ++msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" -+msgstr "" ++msgstr "ソース RPM :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" -+msgstr "" ++msgstr "コミット日時 :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" -+msgstr "" ++msgstr "コミッター :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" -+msgstr "" ++msgstr "理由 :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" -+msgstr "" ++msgstr "取得リポジトリ :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" -+msgstr "" ++msgstr "インストール者 :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" -+msgstr "" ++msgstr "変更者 :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "インストール" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" - msgstr "" +-msgstr "" ++msgstr "アップデート" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "削除" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "再インストール" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" - msgstr "" +-msgstr "" ++msgstr "ダウングレード" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" - msgstr "" +-msgstr "" ++msgstr "非推奨" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "更新" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "不要" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" - msgstr "" +-msgstr "" ++msgstr "---> パッケージ %s.%s %s:%s-%s は %s です" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> トランザクションの確認を実行しています。" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> 新しい変更と依存性の解決を再開しています。" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> 依存性解決を終了しました。" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> 依存性の処理をしています: %s のパッケージ: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> 維持しています: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> 未解決の依存性: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "パッケージ: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1314,7 +1389,7 @@ msgstr "" - "\n" - " 要求: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" 要求: %s" ++msgstr "\n 要求: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1323,7 +1398,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1332,7 +1407,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1341,85 +1416,85 @@ msgstr "" - " 見つかりません" +-msgstr "" +-"\n" +-" 見つかりません" ++msgstr "\n 見つかりません" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "次のものにより更新された: " -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "次のものによりダウングレードされた: " -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "次のものにより不要にされた: " -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "利用可能" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> 衝突を処理しています: %s は %s と衝突しています" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしています" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "検証中" ++ +#: ../utils.py:129 msgid "Running" msgstr "実行中" @@ -74711,7 +76455,7 @@ index a232b0c..c9549cf 100644 msgstr "トレース/停止" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "不明" @@ -74749,27 +76493,37 @@ index a232b0c..c9549cf 100644 msgid "" "\n" "\n" -@@ -1429,7 +1504,7 @@ msgstr "" - "\n" - "ユーザーのキャンセルで終了しています" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"ユーザーのキャンセルで終了しています" ++msgstr "\n\nユーザーのキャンセルで終了しています" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1439,7 +1514,7 @@ msgstr "" - "\n" - "パイプが壊れたため終了しています" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"パイプが壊れたため終了しています" ++msgstr "\n\nパイプが壊れたため終了しています" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1450,41 +1525,41 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -74818,16 +76572,17 @@ index a232b0c..c9549cf 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1492,7 +1567,7 @@ msgstr "" - "\n" - "依存性を解決しました" +-msgstr "" +-"\n" +-"依存性を解決しました" ++msgstr "\n依存性を解決しました" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "完了しました!" -@@ -1504,7 +1579,7 @@ msgstr "" +@@ -1504,7 +1556,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "このコマンドを実行するには root である必要があります。" @@ -74836,7 +76591,7 @@ index a232b0c..c9549cf 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1521,53 +1596,53 @@ msgid "" +@@ -1521,460 +1573,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -74902,9 +76657,12 @@ index a232b0c..c9549cf 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1577,306 +1652,295 @@ msgstr "" - " 「yum repolist all」を実行し、所持するリポジトリーを参照してください。\n" - " 「yum-config-manager --enable 」でリポジトリーを有効にできます。" + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"有効なリポジトリーがありません。\n" +-" 「yum repolist all」を実行し、所持するリポジトリーを参照してください。\n" +-" 「yum-config-manager --enable 」でリポジトリーを有効にできます。" ++msgstr "有効なリポジトリーがありません。\n 「yum repolist all」を実行し、所持するリポジトリーを参照してください。\n 「yum-config-manager --enable 」でリポジトリーを有効にできます。" -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -75005,7 +76763,7 @@ index a232b0c..c9549cf 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "" ++msgstr "グループ情報の表示または使用" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -75034,7 +76792,7 @@ index a232b0c..c9549cf 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "" ++msgstr "無効なグループサブコマンドです、次を使用してください: %s。" -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -75136,329 +76894,337 @@ index a232b0c..c9549cf 100644 msgstr "ソフトウェアリポジトリーの構成を表示する" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "有効" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "無効" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "リポジトリー ID : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "リポジトリーの名前 : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "リポジトリーの状態 : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "リポジトリーのリビジョン : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "リポジトリーのタグ : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "リポジトリー更新日 : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "リポジトリー内パッケージ数 : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "リポジトリー容量 : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "リポジトリー基準 URL : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "リポジトリーメタリンク : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " 更新日 : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "リポジトリーのミラー : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "ずっと (最終: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "インスタント (最終: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s 秒 (最終: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "リポジトリーの期限 : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "リポジトリーの除外 : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "リポジトリーの内包 : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "リポジトリーの除外数 : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " - msgstr "" +-msgstr "" ++msgstr "Repo ファイル名: " #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "リポジトリー ID" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "状態" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "リポジトリー名" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "役立つ使い方のメッセージを表示する" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "%s のヘルプは利用できません" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1886,7 +1950,7 @@ msgstr "" - "\n" - "別名: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"別名: " ++msgstr "\n\n別名: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1896,85 +1960,125 @@ msgstr "" - "\n" - "別名: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"別名: " ++msgstr "\n\n別名: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "再インストール処理の設定をしています" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "パッケージの再インストール" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "ダウングレード処理の設定をしています" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "パッケージのダウングレード" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "ホストの利用できるリポジトリーのバージョンを表示する" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum バージョン グループ" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " グループ :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "パッケージ :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "インストール済み :" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "グループ インストール済み:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "利用可能 :" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "利用可能なグループ :" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "トランザクション履歴を表示、使用する" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" -+msgstr "" ++msgstr "トランザクション:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" -+msgstr "" ++msgstr "開始時間 :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" -+msgstr "" ++msgstr "終了時間 :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" -+msgstr "" ++msgstr "回数 :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" -+msgstr "" ++msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" -+msgstr "" ++msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" -+msgstr "" ++msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" -+msgstr "" ++msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" -+msgstr "" ++msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" -+msgstr "" ++msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "使用した history のサブコマンドが正しくありません: %s" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "履歴 DB にアクセスできません。" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "rpmdb の問題を確認する" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "" +msgstr "filename から保存済みトランザクションを読み込む" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "指定したトランザクション ファイルに保存していません" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "%s からトランザクションを読み込んでいます" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1983,28 +2087,34 @@ msgstr "" +@@ -1983,106 +2055,108 @@ msgstr "" #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +-msgstr "" +msgstr " Yum のチェックに失敗failed: %s" + +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" - msgstr "" - --#: ../yummain.py:114 ++msgstr "現在のディレクトリに読み込み権/実行権がありません、/ に移動します" ++ +#: ../yummain.py:124 +msgid "Can't create lock file; exiting" +msgstr "ロック ファイルの作成に失敗しました。終了します" -+ + +-#: ../yummain.py:114 +#: ../yummain.py:128 msgid "" "Another app is currently holding the yum lock; waiting for it to exit..." @@ -75488,233 +77254,240 @@ index a232b0c..c9549cf 100644 msgid "" "\n" "\n" -@@ -2015,74 +2125,74 @@ msgstr "" - "\n" - "ユーザーによるキャンセルで終了しています。" + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"\n" +-"ユーザーによるキャンセルで終了しています。" ++msgstr "\n\n\nユーザーによるキャンセルで終了しています。" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() は Yum の将来のバージョンでなくなります。\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "構成クラスが終わる前にトランザクションセットを設定しています" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "構成ファイルの tsflag が不正です: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "依存性の pkgSack を検索しています: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "メンバー: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s をインストールに変更しました" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "モード %s にパッケージ %s を追加しています" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "パッケージ %s の削除をしています" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s の要求: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s は %s を要求します" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "必要な要求は既に調べましたが不正をしています" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "必要な要求はパッケージ名ではありません。調べています: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" -msgstr "" +msgstr "%s が提供するモードは %s です: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2090,277 +2200,277 @@ msgstr "" +@@ -2090,999 +2164,1027 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "依存解決のために %s の更新を試みます" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" - msgstr "" +-msgstr "" ++msgstr "TSINFO: %s パッケージが削除として %s で必要としています" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" +-msgstr "" ++msgstr "TSINFO: 依存性を解決するために %s を %s で非推奨にしています。" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." - msgstr "" +-msgstr "" ++msgstr "TSINFO: 依存性を解決するために %s を更新しています" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "依存する更新パスを見つけられません: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s を提供するパッケージはすでにインストールされています。削除しています。" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s はすでに ts にあります。これを飛ばします" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s を更新として %s で設定しています" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: %s をインストールとして %s で設定しています" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "成功 - 空のトランザクション" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "ループを再開しています" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "依存性の処理を終了しています" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "成功 - 依存性を解決しました" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "%s の依存性を確認しています" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "%s の要求として %s を検索しています" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "%s の compare_providers() を実行しています" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s は %s で不要です" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -75722,43 +77495,43 @@ index a232b0c..c9549cf 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "%s と %s の共通ソース RPM(SRPM)" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "ベースパッケージ %s は %s のためにインストールしています" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "%s から %s と %s の共通接頭辞" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "最低限の要求: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " 勝者: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " 敗者(%d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "最適の順序: %s" @@ -75891,8 +77664,9 @@ index a232b0c..c9549cf 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." - msgstr "" - "終了していない残作業があります。それらを終了するために、まず yum-complete-transaction の実行を検討すべきかもしれません。" +-msgstr "" +-"終了していない残作業があります。それらを終了するために、まず yum-complete-transaction の実行を検討すべきかもしれません。" ++msgstr "終了していない残作業があります。それらを終了するために、まず yum-complete-transaction の実行を検討すべきかもしれません。" -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -75909,22 +77683,25 @@ index a232b0c..c9549cf 100644 +#: ../yum/__init__.py:1180 #, python-format msgid "Trying to remove \"%s\", which is protected" - msgstr "" +-msgstr "" ++msgstr "\"%s\" を削除しようとしています、保護されています" -#: ../yum/__init__.py:1217 +#: ../yum/__init__.py:1301 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2368,187 +2478,180 @@ msgstr "" - "\n" - "パッケージは依存関係に問題があるため、飛ばします:" +-msgstr "" +-"\n" +-"パッケージは依存関係に問題があるため、飛ばします:" ++msgstr "\nパッケージは依存関係に問題があるため、飛ばします:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 #, python-format msgid " %s from %s" - msgstr "" +-msgstr "" ++msgstr " %s (%s から)" #. FIXME: _N() -#: ../yum/__init__.py:1391 @@ -75974,7 +77751,7 @@ index a232b0c..c9549cf 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s のインストールを想定したがそうではなかった!" @@ -75985,24 +77762,22 @@ index a232b0c..c9549cf 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s の削除を想定したがそうではなかった!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "%s のロックを開けません: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "%s のロックを開けません: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "PID %s がアクティブかどうかの確認に失敗しました" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "PID %s がアクティブかどうかの確認に失敗しました" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -76012,13 +77787,25 @@ index a232b0c..c9549cf 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "%s でロックを作成できません: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "%s のロックを開けません: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "PID %s がアクティブかどうかの確認に失敗しました" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -76026,23 +77813,23 @@ index a232b0c..c9549cf 100644 msgstr "パッケージは予定したダウンロードと一致しません。 提案: 「yum --enablerepo=%s clean metadata」の実行" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "チェックサムの実行ができません" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "パッケージのチェックサムが一致しません" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗します。" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "%s のローカルコピーを使う" @@ -76059,161 +77846,162 @@ index a232b0c..c9549cf 100644 -" * 必要容量 %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "ヘッダーが完了していません。" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウンロードができません" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "%s の公開鍵がインストールされていません" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "パッケージ %s を開いている最中に問題です" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "%s の公開鍵が信頼されません" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "パッケージ %s は署名されていません" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "%s を削除できません" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s を削除しました" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "%s のファイル %s を削除できませんでした" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s のファイル %s を削除しました" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %sファイルを削除しました" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "" ++msgstr[0] "%d 個の %s ファイルを削除しました" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "更新から %s.%s %s:%s-%s に一致しません" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2556,533 +2659,572 @@ msgstr "" - "searchPackages() は Yum の将来のバージョンでなくなります。 代わりに " - "searchGenerator() を使います。\n" +-msgstr "" +-"searchPackages() は Yum の将来のバージョンでなくなります。 代わりに " +-"searchGenerator() を使います。\n" ++msgstr "searchPackages() は Yum の将来のバージョンでなくなります。 代わりに searchGenerator() を使います。\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "%d 個のパッケージを検索しています" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "" ++msgstr[0] "%d 個のパッケージを検索しています" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "パッケージ %s を検索しています" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "ファイルのエントリーから検索しています" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "提供されたエントリーを検索しています" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "構成されたリポジトリーに利用できるグループはありません" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "グループ名 %s が存在しません" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "パッケージ%s はグループ %s で設定されていません" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "パッケージ %s をグループ %s から追加しています" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "インストールに利用できるパッケージ名 %s がありません" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -76221,79 +78009,79 @@ index a232b0c..c9549cf 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "%s のパッケージが見つかりません" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "インストールへの指定がありません" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "%s の仮想提供かファイル提供を確認しています" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "引数に一致しません: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "パッケージ %s はインストール済みか利用できません" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "インストールに利用できるパッケージはありません" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "パッケージ: %s - すでにトランザクション設定をしています。" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "パッケージ %s は既にインストール済みの %s によって不要扱いになりました。" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -76301,62 +78089,62 @@ index a232b0c..c9549cf 100644 msgstr "パッケージ %s は %s によって不要になりました。しかし、不要のパッケージは要求を提供していません。" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "パッケージ %s は %s によって不要になりました。代わりに %s のインストールを試みています。" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "パッケージ %s はインストール済みか最新バージョンです" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "一致したパッケージ %s はすでにインストールされています。更新を確認しています。" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "すべて更新しています" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "" ++msgstr "アップグレードするために一致するパッケージがありません: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "パッケージは既に不要です: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "既に不要なパッケージの更新はありません: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%s" @@ -76364,56 +78152,57 @@ index a232b0c..c9549cf 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "削除に一致するパッケージはありません" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "" ++msgstr "削除するために一致するパッケージがありません: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "実行中のカーネルを飛ばします: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "トランザクションの中から %s を削除しています。" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "ファイルが開けません: %s を飛ばします。" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "%s を調べています: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." - msgstr "" +-msgstr "" ++msgstr "デルタ RPM をローカルインストールできません: %s。スキップしています。" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性がありません: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "パッケージ %s をインストールできません。それはパッケージ %s により不要になっています。" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -76421,7 +78210,7 @@ index a232b0c..c9549cf 100644 msgstr "パッケージ %s はインストールされていないので更新できません。代わりに「yum install」を実行してインストールしてください。" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -76429,118 +78218,118 @@ index a232b0c..c9549cf 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "%s の除外中" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s をインストール済みとして設定しています" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "次のリポジトリーへの更新として %s を設定します: %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: インストールされたパッケージを更新しません。" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "ファイル %s が開けません。飛ばします。" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "再インストール中に問題: 削除するパッケージがありません" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "再インストールでの問題: インストールのための %s に一致するパッケーがありません" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "ダウングレードに利用できるパッケージはありません" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "パッケージ %s は複数インストールが許可されています。飛ばします" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "利用できるパッケージに一致しません: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "アップグレードにのみ利用できるパッケージ: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "ダウングレードに失敗: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "" ++msgstr "更新に失敗しました: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "%s から鍵を取得中です。" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG 鍵の取得に失敗しました: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "キー %s のGPGキーの署名は、次のレポジトリーのCA鍵と一致していません。: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "%s からの GPG 鍵が正しくありません: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -76554,7 +78343,7 @@ index a232b0c..c9549cf 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -76566,29 +78355,29 @@ index a232b0c..c9549cf 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "鍵のインポートに失敗しました (コード: %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "鍵のインポートに成功しました" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -76596,29 +78385,29 @@ index a232b0c..c9549cf 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "鍵のインポートを助けられません。鍵が壊れていませんか?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "鍵のインポートに失敗しました" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -76626,121 +78415,124 @@ index a232b0c..c9549cf 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "適当なミラーを見つけることができませんでした。" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "パッケージのダウンロード中にエラーに遭遇しました。" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "%s にこのエラーを報告してください" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "テストトランザクションでエラー: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "cackedir が設定できません: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "トランザクションファイル %s が保存できません。: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "保存されているトランザクションファイル %s にアクセスできません。: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "保存されているトランザクションファイルの rpmdb のバージョンがマッチしていません。" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." - msgstr "" +-msgstr "" ++msgstr " 中止しています。" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" - msgstr "" +-msgstr "" ++msgstr "txmbr を見つけられませんでした: %s が %s 状態にあります" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" - msgstr "" +-msgstr "" ++msgstr "txmbr を見つけられませんでした: 起点から %s: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" - msgstr "" - ++msgstr " 要求により、無視しています。依存性を再解決しなければいけません!" ++ +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "" -+ + msgstr "" + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 +#: ../yum/plugins.py:212 @@ -76836,29 +78628,37 @@ index a232b0c..c9549cf 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s は %s を提供していますが、見つかりません。" -@@ -3091,6 +3233,17 @@ msgstr "%s は %s を提供していますが、見つかりません。" +@@ -3091,6 +3193,19 @@ msgstr "%s は %s を提供していますが、見つかりません。" msgid "Repackaging" msgstr "再パッケージをしています" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "検証: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"ダウンロードディレクトリー %s の空きが不十分です\n" -+" * 空き容量 %s\n" -+" * 必要容量 %s" ++msgstr "ダウンロードディレクトリー %s の空きが不十分です\n * 空き容量 %s\n * 必要容量 %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3119,5 +3234,3 @@ msgstr "ヘッダー %s は損傷があります" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "RPM %s へのアクセスでエラー - %s エラー" +- +- diff --git a/po/lt_LT.po b/po/lt_LT.po -index 4a1d933..fe1c1e3 100644 +index 4a1d933..7121773 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po -@@ -2,14 +2,16 @@ +@@ -2,944 +2,970 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -76869,22 +78669,24 @@ index 4a1d933..fe1c1e3 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-21 20:44+0000\n" -+"Last-Translator: aurisc4 \n" - "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/yum/team/lt_LT/)\n" +-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/yum/team/lt_LT/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" ++"Last-Translator: james \n" ++"Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/yum/language/lt_LT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +19,125 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: lt_LT\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Atnaujinama" @@ -76895,31 +78697,31 @@ index 4a1d933..fe1c1e3 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Diegiama" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Pažymėta pasenusiu" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Atnaujinta" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Pašalinta" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Įdiegta" @@ -76946,7 +78748,7 @@ index 4a1d933..fe1c1e3 100644 msgstr "Pašalinta: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Šalinama" @@ -76956,69 +78758,69 @@ index 4a1d933..fe1c1e3 100644 msgstr "Valymas" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Komanda „%s“ jau apibrėžta" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Nustatomos saugyklos" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Skaitoma saugyklų informacija iš vietinių failų" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigūracijos klaida: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Parinkčių klaida: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Įdiegta: %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Sukurta : %s %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Pateikta : %s %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Reikia pateikti kokią nors komandą" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Nėra komandos: %s. Naudokite %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Disko reikalavimai:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Reikia bent %dMB daugiau vietos failų sistemoje %s.\n" @@ -77030,109 +78832,111 @@ index 4a1d933..fe1c1e3 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,60 +145,60 @@ msgstr "" - "Klaidos santrauka\n" - "-------------\n" +-msgstr "" +-"Klaidos santrauka\n" +-"-------------\n" ++msgstr "Klaidos santrauka\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." -msgstr "Bandoma paleisti transakciją, bet nėra veiksmų. Išeinama." +msgstr "Bandoma paleisti tranzakciją, bet nėra veiksmų. Išeinama." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Išeinama po naudotojo komandos" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Parsiunčiami paketai:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Klaida parsiunčiant paketus:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" -msgstr "Vykdomas transakcijos tikrinimas" +msgstr "Vykdomas tranzakcijos tikrinimas" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "KLAIDA Reikia atnaujinti rpm norint apdoroti:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" -msgstr "KLAIDA su transakcijos ir priklausomybių tikrinimu:" +msgstr "KLAIDA su tranzakcijos ir priklausomybių tikrinimu:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM turi būti atnaujintas" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Praneškite apie šią klaidą adresu %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" -msgstr "Vykdomas transakcijos tikrinimas" +msgstr "Vykdomas tranzakcijos tikrinimas" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" -msgstr "Transakcijos tikrinimo klaida:\n" +msgstr "Tranzakcijos tikrinimo klaida:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" -msgstr "Transakcijos tikrinimas sėkmingas" +msgstr "Tranzakcijos tikrinimas sėkmingas" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" -msgstr "Vykdoma transakcija" +msgstr "Vykdoma tranzakcija" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -201,91 +206,116 @@ msgstr "" - "Atsisakoma automatiškai importuoti raktus, kai vykdoma neprižiūrint.\n" - "Naudokite „-y“ veiksenos pakeitimui." +-msgstr "" +-"Atsisakoma automatiškai importuoti raktus, kai vykdoma neprižiūrint.\n" +-"Naudokite „-y“ veiksenos pakeitimui." ++msgstr "Atsisakoma automatiškai importuoti raktus, kai vykdoma neprižiūrint.\nNaudokite „-y“ veiksenos pakeitimui." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Gal turėjote omenyje:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paketas(-ai) %s%s%s prieinami, bet neįdiegti." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Nėra prieinamo paketo %s%s%s." @@ -77140,7 +78944,7 @@ index 4a1d933..fe1c1e3 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paketas(-ai) diegimui" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -77150,13 +78954,13 @@ index 4a1d933..fe1c1e3 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nėra ką atlikti" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paketas(-ai) pažymėti atnaujinimui" @@ -77167,12 +78971,12 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų pažymėtas atnaujinimui" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Nėra paketų, pažymėtų atnaujinimui" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d paketas(-ai) pažymėtas(-i) distribucijos sinchronizavimui" @@ -77183,12 +78987,12 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų pažymėtas distribucijos sinchronizacijai" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Nėra paketų, pažymėtų distribucijos sinchronizavimui" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paketas(-ai) pažymėtas(-i) pašalinimui" @@ -77199,14 +79003,14 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų pažymėtas pašalinimui" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Nėra paketų, pažymėtų pašalinimui" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paketas(-ai) grąžinimui" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -77215,13 +79019,13 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų grąžinimui" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (iš %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Įdiegtas paketas %s%s%s%s neprieinamas." @@ -77229,7 +79033,7 @@ index 4a1d933..fe1c1e3 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paketas(-ai) pakartotiniam diegimui" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -77238,158 +79042,161 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų pakartotiniam diegimui" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Nėra pateiktų paketų" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paketas(-ai) diegimui" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" -msgstr "Paieškos atitikmenu: %s" +msgstr "Paieškos atitikmenų: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " %sTik%s pavadinimo ir santraukos atitikmenys, naudokite „search all“ " - "paieškai visur." +-msgstr "" +-" %sTik%s pavadinimo ir santraukos atitikmenys, naudokite „search all“ " +-"paieškai visur." ++msgstr " %sTik%s pavadinimo ir santraukos atitikmenys, naudokite „search all“ paieškai visur." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -293,147 +323,153 @@ msgstr "" - " %sTik%s pilno pavadinimo ir santraukos atitikmenys, naudokite „search all“" - " paieškai visur." +-msgstr "" +-" %sTik%s pilno pavadinimo ir santraukos atitikmenys, naudokite „search all“" +-" paieškai visur." ++msgstr " %sTik%s pilno pavadinimo ir santraukos atitikmenys, naudokite „search all“ paieškai visur." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Atitinka: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " %sDaugiausia%s pavadinimo ir santraukos atitikmenys, naudokite „search " - "all“ paieškai visur." +-msgstr "" +-" %sDaugiausia%s pavadinimo ir santraukos atitikmenys, naudokite „search " +-"all“ paieškai visur." ++msgstr " %sDaugiausia%s pavadinimo ir santraukos atitikmenys, naudokite „search all“ paieškai visur." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Įspėjimas: nerasta atitikmenų: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Nerasta atitikmenų" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nerasta paketų užklausai %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Išvalomos saugyklos:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Išvaloma viskas" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Išvalomos antraštės" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Išvalomi paketai" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Išvalomi xml metaduomenys" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Išvalomas duomenų bazės podėlis" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Išvalomas pasenę podėlio metaduomenys" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Išvalomi podėlio rpmdb duomenys" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Išvalomi įskiepiai" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Įspėjimas: nėra grupių atitikmenų: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Įdiegto grupės:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Įdiegtos kalbų grupės:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Prieinamos grupės:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Prieinamos kalbų grupės:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Atlikta" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Įspėjimas: nėra grupės %s." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "Nėra paketų diegimui ar atnaujinimui jokioje pageidaujamoje grupėje" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d diegtinas(-i) paketai(-ai)" @@ -77400,18 +79207,18 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų įdiegimui" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Nėra grupės %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Nėra paketų pašalinimui iš grupių" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paketas(-ai) pašalinimui" @@ -77422,554 +79229,561 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d paketų pašalinimui" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paketas %s jau įdiegtas, praleidžiama" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Atmetami nepalyginami paketai %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Nėra įdiegto kito %s, įtraukiama į sąrašą galimam diegimui" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Įskiepių parinktys" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Komandinės eilutės klaida: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -444,285 +480,289 @@ msgstr "" "\n" - "%s: %s parinktis reikalauja argumento" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s parinktis reikalauja argumento" ++msgstr "\n\n%s: %s parinktis reikalauja argumento" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color gali būti: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot turi būti absoliutus kelias: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "rodyti šį pagalbos pranešimą ir išeiti" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "toleruoti klaidas" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "vykdyti tik iš sistemos podėlio jo neatnaujinant" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "konfigūracijos failo vieta" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "didžiausias komandos laukimo laikas" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "derinimo išvesties lygmuo" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "rodyti dublikatus saugyklose, sąrašo/paieškos komandose" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "klaidų išvesties lygmuo" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "derinimo išvesties lygmuo rpm komandai" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "tyli operacija" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "išsami operacija" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "atsakyti „taip“ į visus klausimus" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "atsakyti ne į visus klausimus" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "rodyti Yum versiją ir išeiti" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "nustatyti diegimo šaknį" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "leisti vieną ar daugiau saugyklų (leidžiami pakaitos simboliai)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "drausti vieną ar daugiau saugyklų (leidžiami pakaitos simboliai)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "išskirti paketą(-us) pagal pavadinimą arba globalų vardą" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" -msgstr "drausti iškyrimą iš pagrindinio saugyklai arba viskam" +msgstr "drausti išskyrimą iš pagrindinio saugyklai arba viskam" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "leisti pasenusių apdorojimą atnaujinimo metu" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "drausti Yum įskiepius" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "drausti gpg parašo tikrinimą" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "drausti įskiepius pagal pavadinimą" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "leisti įskiepius pagal pavadinimą" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "praleisti paketus su priklausomybių tikrinimo problemomis" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "valdyti, ar naudojama spalva" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "nustatyti $releasever reikšmę yum konfigūracijoje ir saugyklų failuose" +-msgstr "" +-"nustatyti $releasever reikšmę yum konfigūracijoje ir saugyklų failuose" ++msgstr "nustatyti $releasever reikšmę yum konfigūracijoje ir saugyklų failuose" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "nustatyti savavališkas konfigūracijos ir saugyklų parinktis" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Sau" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Vas" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Kov" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Bal" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Ge" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Bir" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Lie" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Rug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Rgs" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Spa" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Lap" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Gr" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Bandoma kita dubliuojamoji tinklavietė" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Pavadinimas : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Architektūra: %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epocha : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Versija : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Leidimas : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Dydis : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Saugykla : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Iš saugyklos : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Pateikėjas : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Pateikta : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Sukūrimo laikas: %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Įdiegimo laikas: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Įdiegė : %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Pakeitė : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Santrauka : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licencija : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Aprašymas : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "t" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "taip" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ne" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Ar tai tinka [t/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -731,154 +771,157 @@ msgstr "" - "\n" - "Grupė: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grupė: %s" ++msgstr "\nGrupė: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Grupės id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Aprašymas: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "Kalba: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Privalomi paketai:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Numatytieji paketai:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Papildomi paketai:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Sąlyginiai paketai:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paketas: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Šis paketas neturi priklausomybių" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " priklausomybė: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Nepatenkinta priklausomybė" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Atitinka:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licencija : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Failo pavadinimas: %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Kita : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Įvyko klaida skaičiuojant visą parsiuntimo dydį" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Visas dydis: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Visas parsiuntimo dydis: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Įdiegimo dydis: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Įvyko klaida skaičiuojant įdiegimo dydį" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Perdiegiama" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Grąžinama" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Diegiamos priklausomybės" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Atnaujinama priklausomybėms" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Šalinama dėl priklausomybių" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Praleista (priklausomybių problemos)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Neįdiegtas" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Neprieinama" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paketas" +msgid_plural "Packages" @@ -77978,49 +79792,49 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "Paketų" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Architektūra" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versija" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Saugykla" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Dydis" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " pakeičiama %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -886,60 +929,62 @@ msgid "" + "Transaction Summary\n" "%s\n" - msgstr "" - "\n" +-msgstr "" +-"\n" -"Transakcijos santrauka\n" -+"Tranzakcijos santrauka\n" - "%s\n" +-"%s\n" ++msgstr "\nTranzakcijos santrauka\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Įdiegti %5.5s pektą(-us)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Įdiegti" @@ -78028,7 +79842,7 @@ index 4a1d933..fe1c1e3 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Atnaujinti %5.5s paketą(-us)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Atnaujinti" @@ -78036,7 +79850,7 @@ index 4a1d933..fe1c1e3 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Pašalinti %5.5s paketą(-us)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Pašalinti" @@ -78044,7 +79858,7 @@ index 4a1d933..fe1c1e3 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Perdiegti %5.5s paketą„-u)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Perdiegti" @@ -78052,11 +79866,11 @@ index 4a1d933..fe1c1e3 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Grąžinti %5.5s paketą(-us)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Grąžinti" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Priklausomas paketas" @@ -78064,321 +79878,325 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "Priklausomų paketų" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Pašalinta" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Priklausomybė pašalinta" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Priklausomybė įdiegta" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Priklausomybė atnaujinta" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Pakeista" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Nepavyko" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "du" -@@ -947,7 +992,7 @@ msgstr "du" +@@ -947,565 +973,598 @@ msgstr "du" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -958,365 +1003,417 @@ msgstr "" - " Dabartinis parsiuntimas atšauktas, %snutraukite (ctrl-c) vėl%s per %s%s%s sekundes\n" - "išėjimui.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Dabartinis parsiuntimas atšauktas, %snutraukite (ctrl-c) vėl%s per %s%s%s sekundes\n" +-"išėjimui.\n" ++msgstr "\n Dabartinis parsiuntimas atšauktas, %snutraukite (ctrl-c) vėl%s per %s%s%s sekundes\nišėjimui.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "naudotojo nutraukimas" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Iš viso" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "Praleidžiama persidengianti transakcija %d, apjungta į %d" +msgstr "Praleidžiama persidengianti tranzakcija %d, apjungta į %d" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "Nėra transakcijų" +msgstr "Nėra tranzakcijų" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" -msgstr "Pateikti blogi transakcijų ID arba paketai" +msgstr "Pateikti blogi tranzakcijų ID arba paketai" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Komandų eilutė" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Prisijungęs naudotojas" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Data ir laikas" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Veiksmas(-ai)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Pakeista" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" -msgstr "Nepateiktas transakcijos ID" +msgstr "Nepateiktas tranzakcijos ID" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" -msgstr "Pateiktas blogas transakcijos ID" +msgstr "Pateiktas blogas tranzakcijos ID" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" -msgstr "Nerastas pateiktas transakcijos ID" +msgstr "Nerastas pateiktas tranzakcijos ID" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" -msgstr "Rastas daugiau nei vienas transakcijos ID!" +msgstr "Rastas daugiau nei vienas tranzakcijos ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" -msgstr "Nepateiktas transakcijos ID arba paketas" +msgstr "Nepateiktas tranzakcijos ID arba paketas" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Grąžintas" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Senesnis" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Naujesnis" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" -msgstr "Transakcijos ID:" +msgstr "Tranzakcijos ID:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Pradžios laikas:" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Pradėti rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u sekundžių)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minučių)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u valandų)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u dienų)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Pabaigos laikas:" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Baigti rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Naudotojas :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Grąžinimo kodas:" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Nutraukta" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Klaidos:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Klaida:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Sėkminga" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Komandų eilutė :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Išsaugota papildoma nenumatyta informacija: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" -msgstr "Transakcija atlikta su:" +msgstr "Tranzakcija atlikta su:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Pakeisti paketai:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Praleisti paketai:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb problemos:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scenarijaus išvestis:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Klaidos:" @@ -78387,17 +80205,17 @@ index 4a1d933..fe1c1e3 100644 -msgstr "Įdiegti" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Įdiegti priklausomybes" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Pažymima pasenusiu" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Pašalinti" @@ -78410,302 +80228,317 @@ index 4a1d933..fe1c1e3 100644 -msgstr "Grąžinti" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Atnaujinti" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Laikas" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Vakar" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Praėjusią savaitę" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Praėjusias 2 savaites" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Praėjusius 3 mėnesius" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Praėjusius 6 mėnesius" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Praėjusiais metais" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Daugiau nei prieš metus" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" -msgstr "Nerasta transakcija %s" +msgstr "Nerasta tranzakcija %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" -msgstr "Transakcijos ID:" +msgstr "Tranzakcijos ID:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Prieinama papildoma istorijos informacija:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: nerasta papildomų duomenų su šiuo pavadinimu" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Paketas :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "Būsena :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Dydis :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Sukūrimo vieta :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Sukūrimo laikas:" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Supakavo :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Tiekėjas :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Licencija :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "Išeities RPM :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Įdėjimo laikas :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Įdėjo :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Priežastis :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Iš saugyklos :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Įdiegė :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Pakeitė :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "įdiegta" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "atnaujinimas" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "pašalinta" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "perdiegta" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "grąžinimas" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "žymima pasenusiu" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "atnaujinta" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "pažymėta pasenusiu" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paketas %s.%s %s:%s-%s bus %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" -msgstr "--> Vykdomas transakcijos tikrinimas" +msgstr "--> Vykdomas tranzakcijos tikrinimas" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." - msgstr "" - "--> Iš naujo paleidžiamas priklausomybių sprendimas su naujais pakeitimais" +-msgstr "" +-"--> Iš naujo paleidžiamas priklausomybių sprendimas su naujais pakeitimais" ++msgstr "--> Iš naujo paleidžiamas priklausomybių sprendimas su naujais pakeitimais" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Baigtas priklausomybių sprendimas" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Apdorojama priklausomybė: %s paketui: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Paliekamas paketas: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nerasta priklausomybė: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paketas: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1325,7 +1422,7 @@ msgstr "" - "\n" - " Reikalauja: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Reikalauja: %s" ++msgstr "\n Reikalauja: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1334,7 +1431,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1343,7 +1440,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1352,85 +1449,85 @@ msgstr "" - " Nerasta" +-msgstr "" +-"\n" +-" Nerasta" ++msgstr "\n Nerasta" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Atnaujino" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Grąžino" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Pažymėjo pasenusiu" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Prieinamas" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Sprendžiamas konfliktas: %s konfliktuoja su %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." -msgstr "--> Tęsiama transakcija su pasirinktais paketais. Palaukite." +msgstr "--> Tęsiama tranzakcija su pasirinktais paketais. Palaukite." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." -msgstr "---> Grąžinama %s antraštė įpakavimui į transakcijos aibę." +msgstr "---> Grąžinama %s antraštė įpakavimui į tranzakcijos aibę." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Vykdoma" @@ -78731,7 +80564,7 @@ index 4a1d933..fe1c1e3 100644 msgstr "Sekamas/Sustabdytas" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Nežinomas" @@ -78769,36 +80602,47 @@ index 4a1d933..fe1c1e3 100644 msgid "" "\n" "\n" -@@ -1440,7 +1537,7 @@ msgstr "" - "\n" - "Išeinama naudotojui nutraukus" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Išeinama naudotojui nutraukus" ++msgstr "\n\nIšeinama naudotojui nutraukus" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1450,7 +1547,7 @@ msgstr "" - "\n" - "Išeinama dėl nutraukto konvejerio" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Išeinama dėl nutraukto konvejerio" ++msgstr "\n\nIšeinama dėl nutraukto konvejerio" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1461,7 +1558,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1469,35 +1566,35 @@ msgstr "" - "Kita programa šiuo metu turi yum užraktą; išeinama, kaip nustatyta parametru" - " exit_on_lock" +-msgstr "" +-"Kita programa šiuo metu turi yum užraktą; išeinama, kaip nustatyta parametru" +-" exit_on_lock" ++msgstr "Kita programa šiuo metu turi yum užraktą; išeinama, kaip nustatyta parametru exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -78839,16 +80683,17 @@ index 4a1d933..fe1c1e3 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1505,7 +1602,7 @@ msgstr "" - "\n" - "Išspręstos priklausomybės" +-msgstr "" +-"\n" +-"Išspręstos priklausomybės" ++msgstr "\nIšspręstos priklausomybės" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Baigta!" -@@ -1517,7 +1614,7 @@ msgstr " Mini naudojimas:\n" +@@ -1517,7 +1576,7 @@ msgstr " Mini naudojimas:\n" msgid "You need to be root to perform this command." msgstr "Jūs turite būti root šiai komandai atlikti." @@ -78857,9 +80702,25 @@ index 4a1d933..fe1c1e3 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1547,54 +1644,54 @@ msgstr "" +@@ -1532,479 +1591,485 @@ msgid "" + "will install it for you.\n" "\n" - "Daugiau informacijos gausite susisiekę su jūsų distribucijos ar paketo tiekėju.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Jūs įjungėte paketų tikrinimą naudojant GPG raktus. Tai yra gerai. \n" +-"Tačiau jūs neturite įdiegę jokių GPG viešų raktų. Jums reikia parsiūsti\n" +-"ir įdiegti raktus paketams, kuriuos jūs norite įdiegti.\n" +-"Tą galite padaryti įvykdydami komandą:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Jūs taip pat galite nurodyti rakto url, kurį norite naudoti\n" +-"saugyklai „gpgkey“ parinktyje saugyklos sekcijoje ir yum \n" +-"jį jums įdiegs.\n" +-"\n" +-"Daugiau informacijos gausite susisiekę su jūsų distribucijos ar paketo tiekėju.\n" ++msgstr "\nJūs įjungėte paketų tikrinimą naudojant GPG raktus. Tai yra gerai. \nTačiau jūs neturite įdiegę jokių GPG viešų raktų. Jums reikia parsiūsti\nir įdiegti raktus paketams, kuriuos jūs norite įdiegti.\nTą galite padaryti įvykdydami komandą:\n rpm --import public.gpg.key\n\n\nJūs taip pat galite nurodyti rakto url, kurį norite naudoti\nsaugyklai „gpgkey“ parinktyje saugyklos sekcijoje ir yum \njį jums įdiegs.\n\nDaugiau informacijos gausite susisiekę su jūsų distribucijos ar paketo tiekėju.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -78917,17 +80778,21 @@ index 4a1d933..fe1c1e3 100644 -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 msgid "Error: more than one file given as argument to shell." - msgstr "" - "Klaida: daugiau nei vienas failas perduotas kaip argumentas apvalkalui." +-msgstr "" +-"Klaida: daugiau nei vienas failas perduotas kaip argumentas apvalkalui." ++msgstr "Klaida: daugiau nei vienas failas perduotas kaip argumentas apvalkalui." -#: ../yumcommands.py:148 +#: ../yumcommands.py:192 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1604,306 +1701,295 @@ msgstr "" - " Paleiskite „yum repolist all“ visam saugyklų sąrašui gauti.\n" - " Jūs galite įjungti saugyklas su yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Nėra įjungtų saugyklų.\n" +-" Paleiskite „yum repolist all“ visam saugyklų sąrašui gauti.\n" +-" Jūs galite įjungti saugyklas su yum-config-manager --enable " ++msgstr "Nėra įjungtų saugyklų.\n Paleiskite „yum repolist all“ visam saugyklų sąrašui gauti.\n Jūs galite įjungti saugyklas su yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -79159,121 +81024,121 @@ index 4a1d933..fe1c1e3 100644 msgstr "Rodyti nustatytas programinės įrangos saugyklas" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "įjungta" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "išjungta" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Saugyklos id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Saugyklos pavadinimas: " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Saugyklos būsena: " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " -msgstr "Saugyklos poversijis: " +msgstr "Saugyklos po-versija: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Saugyklos žymos: " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Saugyklos distribucijos žymos: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Saugykla atnaujinta: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Saugyklos paketai: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Saugyklos dydis: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Saugyklos bazinis url: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Saugyklos metasaitas: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Atnaujinta : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Saugyklos tinklavietės: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Niekada (paskutinis: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Neatdėliotinas (paskutinis: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekundė(s) (paskutinis: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Saugykla pasensta: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Saugykla išskiria: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Saugykla įtraukia: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Saugykloje išskirta: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Saugyklos failas: " @@ -79281,192 +81146,198 @@ index 4a1d933..fe1c1e3 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "Saugyklos id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "būsena" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "saugyklos pavadinimas" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Parodyti naudingą naudojimo pranešimą" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Nėra pagalbos veiksmui %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1913,7 +1999,7 @@ msgstr "" - "\n" - "alternatyvūs vardai: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"alternatyvūs vardai: " ++msgstr "\n\nalternatyvūs vardai: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1923,88 +2009,128 @@ msgstr "" - "\n" - "alternatyvus vardas: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"alternatyvus vardas: " ++msgstr "\n\nalternatyvus vardas: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Nustatomas perdiegimo procesas" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "perdiegti paketą" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Nustatomas grąžinimo procesas" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "grąžinti paketą" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Parodyti mašinos ir prieinamų saugyklų versiją." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "Yum versijų grupės:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Grupė :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Paketai:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr " Įdiegti:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Įdiegti per grupes:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Prieinami:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Prieinami per grupes:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" -msgstr "Parodyti arba naudoti transakcijų istoriją" +msgstr "Parodyti arba naudoti tranzakcijų istoriją" + -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Tranzakcijos:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Pradžia :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Pabaiga :" - --#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2464 ++ ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Kartai :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" -+ -+#: ../yumcommands.py:2466 + +-#: ../yumcommands.py:1432 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Netinkama istorijos po-komanda, naudokite: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Jūs neturite priėjimo prie istorijos DB." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Ieškoti problemų rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "įkelti išsaugotą transakciją iš failo" +msgstr "įkelti išsaugotą tranzakciją iš failo" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "Nenurodytas įšsaugotos transakcijos failas." +msgstr "Nenurodytas įšsaugotos tranzakcijos failas." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "įkeliama transakcija iš %s" +msgstr "įkeliama tranzakcija iš %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "Transakcija, įkelta iš %s su %s nariais" @@ -79474,7 +81345,7 @@ index 4a1d933..fe1c1e3 100644 #. This is mainly for PackageSackError from rpmdb. #: ../yummain.py:84 -@@ -2012,28 +2138,34 @@ msgstr "Transakcija, įkelta iš %s su %s nariais" +@@ -2012,105 +2077,106 @@ msgstr "Transakcija, įkelta iš %s su %s nariais" msgid " Yum checks failed: %s" msgstr " Yum ckeck nepavyko: %s" @@ -79506,290 +81377,295 @@ index 4a1d933..fe1c1e3 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" +-msgstr "" +-"Jūsų transakcija išsaugota, paleiskite ją su komanda: yum load-transaction " +-"%s" +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" - msgstr "" --"Jūsų transakcija išsaugota, paleiskite ją su komanda: yum load-transaction " -+"Jūsų tranzakcija buvo įrašyta, paleiskite iš jaujo su: yum load-transaction " - "%s" ++msgstr "Jūsų tranzakcija buvo įrašyta, paleiskite iš jaujo su: yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2043,74 +2175,74 @@ msgstr "" - "\n" - "Išeinama po naudotojo atšaukimo." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Išeinama po naudotojo atšaukimo." ++msgstr "\n\nIšeinama po naudotojo atšaukimo." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() bus pašalinta ateities Yum versijose.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Nustatoma TransactionSets prieš konfigūracijos klasės pakrovimą" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Netinkama tsflag konfigūracijos faile: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Ieškoma pkgSack priklausomybei: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Narys: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s pakeistas diegimui" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Pridedamas paketas %s veiksenoje %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Šalinamas paketas %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s reikalauja: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s reikalauja %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Reikalingo reikalavimo jau ieškota, apgaunama" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Reikalavimas nėra paketo pavadinimas. Ieškoma: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Potencialus tiekėjas: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Veiksena %s %s tiekėjui : %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Veiksena paketui, teikiančiam %s: %s" -@@ -2118,114 +2250,114 @@ msgstr "Veiksena paketui, teikiančiam %s: %s" +@@ -2118,1028 +2184,1031 @@ msgstr "Veiksena paketui, teikiančiam %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Bandoma atnaujinti %s priklausomybių išsprendimui" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Nerasta %s atnaujinimo kelių. Klaida!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s paketas, reikalaujantis %s pažymėtas pašalinimui" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: %s žymimas pasenusiu su %s, siekiant išspręsti priklausomybę." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Atnaujinamas %s, siekiant išspręsti priklausomybę." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Nepavyko rasti priklausomybės atnaujinimo kelio: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Greitas atitikmuo %s %s reikalavimui" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s yra teikiančių paketų sąraše, bet jis jau įdiegtas, pašalinama." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potencialiai sprendžiantis paketas %s ts turi naujesnį variantą." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potencialiai sprendžiantis paketas %s turi įdiegtą naujesnį variantą." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s jau ts, praleidžiama" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: pažymima %s kaip %s atnaujinimą" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: pažymima %s kaip %s diegimą" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" -msgstr "Sėkminga - tuščia transakcija" +msgstr "Sėkminga - tuščia tranzakcija" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Iš naujo paleidžiamas ciklas" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Užbaigiamas priklausomybių procesas" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Sėkminga - priklausomybės išspręstos" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Ieškoma %s priklausomybių" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "ieškoma %s kaip %s reikalavimo" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "%s vykdoma compare_providers()" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "po %s geresnė architektūra" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s žymi pasenusiu %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2234,164 +2366,164 @@ msgstr "" - "archdist palygino %s su %s vietoje %s\n" - " Nugalėtojas: %s" + " Winner: %s" +-msgstr "" +-"archdist palygino %s su %s vietoje %s\n" +-" Nugalėtojas: %s" ++msgstr "archdist palygino %s su %s vietoje %s\n Nugalėtojas: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "bendras išeities rpm %s ir %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "bazinis paketas %s įdiegtas paketui %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "bendras priešdėlis %s abiems %s ir %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "reikalauja mažiausiai: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Nugalėtojas: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Pralaimėtojas (su %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Geriausia tvarka: %s" @@ -79922,10 +81798,10 @@ index 4a1d933..fe1c1e3 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." - msgstr "" +-msgstr "" -"Yra likusių nebaigtų transakcijų. Jūs turbūt norite paleisti yum-complete-" -+"Yra likusių nebaigtų tranzakcijų. Jūs turbūt norite paleisti yum-complete-" - "transaction joms užbaigti." +-"transaction joms užbaigti." ++msgstr "Yra likusių nebaigtų tranzakcijų. Jūs turbūt norite paleisti yum-complete-transaction joms užbaigti." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -79949,9 +81825,10 @@ index 4a1d933..fe1c1e3 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2399,88 +2531,91 @@ msgstr "" - "\n" - "Paketai, praleisti dėl priklausomybių problemų:" +-msgstr "" +-"\n" +-"Paketai, praleisti dėl priklausomybių problemų:" ++msgstr "\nPaketai, praleisti dėl priklausomybių problemų:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -79985,10 +81862,10 @@ index 4a1d933..fe1c1e3 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" +-msgstr "" -"Įspėjimas: scenarijaus arba kitos negalutinės klaidos įvyko transakcijos " -+"Įspėjimas: scenarijaus arba kitos negalutinės klaidos įvyko tranzakcijos " - "metu." +-"metu." ++msgstr "Įspėjimas: scenarijaus arba kitos negalutinės klaidos įvyko tranzakcijos metu." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -80013,7 +81890,7 @@ index 4a1d933..fe1c1e3 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s turėjo būti įdiegtas, bet nebuvo!" @@ -80024,24 +81901,22 @@ index 4a1d933..fe1c1e3 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s turėjo būti pašalintas, bet nebuvo!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Nepavyko atverti užrakto %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Nepavyko atverti užrakto %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Nepavyksta patikrinti, ar PID %s yra aktyvus" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Nepavyksta patikrinti, ar PID %s yra aktyvus" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -80051,38 +81926,52 @@ index 4a1d933..fe1c1e3 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nepavyko sukurti užrakto %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Nepavyko atverti užrakto %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Nepavyksta patikrinti, ar PID %s yra aktyvus" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2489,40 +2624,29 @@ msgstr "" - "Paketai nesutampa su pageidautu parsiuntimu. Pasiūlymas: paleisti yum " "--enablerepo=%s clean metadata" +-msgstr "" +-"Paketai nesutampa su pageidautu parsiuntimu. Pasiūlymas: paleisti yum " +-"--enablerepo=%s clean metadata" ++msgstr "Paketai nesutampa su pageidautu parsiuntimu. Pasiūlymas: paleisti yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Nepavyko patikrinti kontrolinės sumos" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Paketo kontrolinė suma nesutampa" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "paketo kontrolinė suma nesutampa, bet %s podėlis yra įjungtas" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "naudojama vietinė %s kopija" @@ -80099,69 +81988,70 @@ index 4a1d933..fe1c1e3 100644 -" * reikia %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Antraštė nepilna." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2530,62 +2654,65 @@ msgstr "" - "Antraštė ne vietiniame podėlyje, o tik podėlio veiksena yra įjungta. " - "Negalima parsiūsti %s" +-msgstr "" +-"Antraštė ne vietiniame podėlyje, o tik podėlio veiksena yra įjungta. " +-"Negalima parsiūsti %s" ++msgstr "Antraštė ne vietiniame podėlyje, o tik podėlio veiksena yra įjungta. Negalima parsiūsti %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "%s viešas raktas neįdiegtas" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problema atveriant paketą %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "%s viešasis raktas nepatikimas" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Paketas %s nepasirašytas" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Nepavyksta pašalinti %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s pašalintas" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Nepavyksta pašalinti %s failo %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s failas %s pašalintas" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s failai pašalinti" @@ -80172,28 +82062,29 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "%d %s failų pašalintas" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Daugiau nei vienas identiškas atitikmuo ieškomam %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Nėra %s.%s %s:%s-%s atitikmenų atnaujinime" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2593,121 +2720,125 @@ msgstr "" - "searchPackages() bus pašalinta ateities Yum versijose. " - "Naudokite searchGenerator(). \n" +-msgstr "" +-"searchPackages() bus pašalinta ateities Yum versijose. " +-"Naudokite searchGenerator(). \n" ++msgstr "searchPackages() bus pašalinta ateities Yum versijose. Naudokite searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Ieškoma %d paketų" @@ -80204,62 +82095,62 @@ index 4a1d933..fe1c1e3 100644 +msgstr[2] "Ieškoma %d paketų" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "ieškoma paketo %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "ieškoma failų įrašuose" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "ieškoma teikimo įrašuose" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Nėra prieinamų grupių duomenų nustatytose saugyklose" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Nėra grupės %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "paketas %s nebuvo pažymėtas grupėje %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Pridedamas paketas %s iš grupės %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Nėra paketo %s, prieinamo diegimui" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Įspėjimas: grupė %s neturi jokių paketų." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "Grupė %s turi %u sąlyginių paketų, kurie gali būti įdiegti." @@ -80267,144 +82158,146 @@ index 4a1d933..fe1c1e3 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Nepavyksta rasti paketų rinkinio %s krepšyje" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Nepavyksta rasti paketų rinkinio %s rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Netinkamas versijos požymis iš: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Nerastas paketas %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Paketo objektas nebuvo paketo objekto egzempliorius" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Nieko nenurodyta įdiegti" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Tikrinamas virtualus tiekimas arba failo tiekimas %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Nėra atitikmens argumentui: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Paketas %s įdiegtas ir neprieinamas" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Nėra paketo(-ų), prieinamo diegimui" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" -msgstr "Paketas: %s - jau transakcijos aibėje" +msgstr "Paketas: %s - jau tranzakcijos aibėje" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paketas %s yra pažymėtas pasenusiu paketo %s, kuris jau įdiegtas" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2716,95 +2847,101 @@ msgstr "" - "Paketas %s pažymėtas pasenusiu paketo %s, bet žymėjimas pasenusiu neatitinka" - " reikalavimų" + "requirements" +-msgstr "" +-"Paketas %s pažymėtas pasenusiu paketo %s, bet žymėjimas pasenusiu neatitinka" +-" reikalavimų" ++msgstr "Paketas %s pažymėtas pasenusiu paketo %s, bet žymėjimas pasenusiu neatitinka reikalavimų" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paketas %s pažymėtas pasenusiu paketo %s, todėl bandoma įdiegti %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Paketas %s jau įdiegtas ir paskutinės versijos" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Paketas, atitinkantis %s, jau įdiegtas. Tikrinamas atnaujinimas." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Atnaujinti viską" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Neatnaujinamas paketas, kuris jau yra pasenęs: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Nerasta paketo atnaujinimui: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketas jau yra pasenęs: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Neatnaujinamas paketas, kuris yra pasenęs: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Neatnaujinamas paketas, kuris jau yra atnaujintas: %s.%s %s:%s-%s" @@ -80412,407 +82305,411 @@ index 4a1d933..fe1c1e3 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nėra paketo atitikmens pašalinimui" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Nerasta paketo pašalinimui: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Praleidžiama ir vykdomas branduolys: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" -msgstr "Pašalinamas %s iš transakcijos" +msgstr "Pašalinamas %s iš tranzakcijos" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nepavyksta atverti: %s. Praleidžiama." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Tikrinama %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Nepavyksta vietinis deltarpm diegimas: %s. Praleidžiama." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" +-msgstr "" -"Nepavyksta pridėti paketo %s į transakciją. Nesuderinama architektūra: %s" -+"Nepavyksta pridėti paketo %s į tranzakciją. Nesuderinama architektūra: %s" ++msgstr "Nepavyksta pridėti paketo %s į tranzakciją. Nesuderinama architektūra: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Nepavyksta įdiegti paketo %s. Jis pažymėtas pasenusiu įdiegto paketo %s" +-msgstr "" +-"Nepavyksta įdiegti paketo %s. Jis pažymėtas pasenusiu įdiegto paketo %s" ++msgstr "Nepavyksta įdiegti paketo %s. Jis pažymėtas pasenusiu įdiegto paketo %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2813,7 +2950,7 @@ msgstr "" - "Paketas %s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jo " - "įdiegimui." + "instead." +-msgstr "" +-"Paketas %s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jo " +-"įdiegimui." ++msgstr "Paketas %s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jo įdiegimui." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2822,137 +2959,146 @@ msgstr "" - "Paketas %s.%s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jam" - " įdiegti." + " instead." +-msgstr "" +-"Paketas %s.%s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jam" +-" įdiegti." ++msgstr "Paketas %s.%s neįdiegtas, negalima jo atnaujinti. Paleiskite yum install jam įdiegti." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Išskiriamas %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Žymimas %s įdiegimui" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Žymimas %s kaip %s atnaujinimas" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: neatnaujina įdiegto paketo." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nepavyksta atverti failo: %s. Praleidžiama." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Perdiegimo problema: nėra paketo atitikmens pašalinimui" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Perdiegimo problema: nėra paketo %s atitikmens diegimui" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Nėra paketo(-ų) grąžinimui" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paketas %s leidžia daugkartinius diegimus, praleidžiama" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Nėra atitikmens prieinamam paketui: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Tik atnaujinimas yra prieinamas paketui: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Nepavyko grąžinti: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Nepavyko atnaujinti: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Gaunamas raktas iš %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG rakto gavimas nepavyko: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "GPG rakto parašas raktui %s neatitinka saugyklos CA rakto: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG rakto parašas patikrinas su CA raktu(-ais)." -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Netinkamas GPG raktas iš %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG rakto skaitymas nepavyko: raktas neturi %s reikšmės" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" +-msgstr "" +-"Importuojamas %s raktas 0x%s:\n" +-" Naudotojo id: %s\n" +-" Paketas : %s (%s)\n" +-" Iš : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" Package : %s (%s)\n" +" From : %s" - msgstr "" - "Importuojamas %s raktas 0x%s:\n" --" Naudotojo id: %s\n" --" Paketas : %s (%s)\n" --" Iš : %s" -+" Naudotojas : „%s“\n" -+" Atspaudas : %s\n" -+" Paketas : %s (%s)\n" -+" Iš : %s" ++msgstr "Importuojamas %s raktas 0x%s:\n Naudotojas : „%s“\n Atspaudas : %s\n Paketas : %s (%s)\n Iš : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" +-msgstr "" +-"Importuojamas %s raktas 0x%s:\n" +-" Naudotojo id: \"%s\"\n" +-" Iš : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" - msgstr "" - "Importuojamas %s raktas 0x%s:\n" --" Naudotojo id: \"%s\"\n" --" Iš : %s" -+" Naudotojas : „%s“\n" -+" Atspaudas : %s\n" -+" Iš : %s" ++msgstr "Importuojamas %s raktas 0x%s:\n Naudotojas : „%s“\n Atspaudas : %s\n Iš : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG raktas iš %s (0x%s) jau įdiegtas" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Rakto importas neapvyko (kodas %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Raktas sėkmingai importuotas" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Neįdiegta jokių raktų" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2961,25 +3107,25 @@ msgstr "" - "GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi šiam paketui.\n" - "Patikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi šiam paketui.\n" +-"Patikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." ++msgstr "GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi šiam paketui.\nPatikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Rakto(-ų) importas nepadėjo, neteisingas(-i) raktas(-ai)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG raktas iš %s (0x%s) jau importuotas" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Rakto importas nepavyko" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Neįdiegta jokių raktų saugyklai %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2988,158 +3134,182 @@ msgstr "" - "GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi.\n" - "Patikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi.\n" +-"Patikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." ++msgstr "GPG raktai, išvardinti „%s“ saugyklai, jau yra įdiegti, bet nėra teisingi.\nPatikrinkite, ar teisingi URL yra nustatyti šiai saugyklai." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Nepavyksta rasti tinkamos dubliuojančios tinklavietės." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Kilo klaidų parsiunčiant paketus." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Praneškite apie šią klaidą adresu %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " -msgstr "Transakcijos testavimo klaidos: " +msgstr "Tranzakcijos testavimo klaidos: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Nepavyko nustatyti podėlio katalogo: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." -msgstr "Priklausomybės neįšspręsto. Neišsaugoma neišspręsta transakcija." +msgstr "Priklausomybės neįšspręsto. Neišsaugoma neišspręsta tranzakcija." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "Nepavyko išsaugoti transakcijos į failą %s: %s" +msgstr "Nepavyko išsaugoti tranzakcijos į failą %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "Nepavyko pasiekti/perskaityti išsaugotos transakcijos %s : %s" +msgstr "Nepavyko pasiekti/perskaityti išsaugotos tranzakcijos %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "rpmdb versija nesutampa su išsaugotos transakcijos versija, " +msgstr "rpmdb versija nesutampa su išsaugotos tranzakcijos versija, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " nepaisoma, kaip nurodyta." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " atšaukiama." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "nepavyksta rasti tsflags arba tai nėra sveikas skaičius." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Rastas txmbr nežinomoje būsenoje: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Nepavyksta rasti txmbr: %s būsenoje %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Nepavyksta rasti txmbr: %s iš šaltinio: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," -msgstr "Trūksta transakcijos narių, ryšių arba transakcija buvo pakeista," +msgstr "Trūksta tranzakcijos narių, ryšių arba transakcija buvo pakeista," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " nepaisoma, kaip nurodyta. Jūs turite išspręsti priklausomybes!" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s jau buvo aplankytas ir negali būti pašalintas." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Tikrinama %s revdeps" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s turi revdep %s, kuri yra naudotojo įdiegta." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s neturi naudotojo įdiegtų revdeps." @@ -80864,8 +82761,9 @@ index 4a1d933..fe1c1e3 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Vienas ar daugiau įskiepių pavadinimu „%s“ yra įskiepių ieškojimo kelyje" +-msgstr "" +-"Vienas ar daugiau įskiepių pavadinimu „%s“ yra įskiepių ieškojimo kelyje" ++msgstr "Vienas ar daugiau įskiepių pavadinimu „%s“ yra įskiepių ieškojimo kelyje" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -80913,29 +82811,47 @@ index 4a1d933..fe1c1e3 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s teikia %s, bet nepavyksta jo rasti" -@@ -3148,6 +3318,17 @@ msgstr "%s teikia %s, bet nepavyksta jo rasti" +@@ -3148,6 +3217,19 @@ msgstr "%s teikia %s, bet nepavyksta jo rasti" msgid "Repackaging" msgstr "Perpakuojama" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Nepakanka vietos parsiuntimų kataloge %s\n" -+" * laisva %s\n" -+" * reikia %s" ++msgstr "Nepakanka vietos parsiuntimų kataloge %s\n * laisva %s\n * reikia %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3160,8 +3242,7 @@ msgstr "RPM %s neatitinka md5 tikrinimo" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Nepavyksta atverti RPM duomenų bazės skaitymui. Galbūt ji jau naudojama?" ++msgstr "Nepavyksta atverti RPM duomenų bazės skaitymui. Galbūt ji jau naudojama?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3177,5 +3258,3 @@ msgstr "Sugadinta antraštė %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Klaida atveriant rpm %s - klaida %s" +- +- diff --git a/po/mr.po b/po/mr.po -index 5163eab..88cbe8e 100644 +index 5163eab..c57b393 100644 --- a/po/mr.po +++ b/po/mr.po -@@ -2,13 +2,14 @@ +@@ -2,427 +2,453 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -80943,22 +82859,24 @@ index 5163eab..88cbe8e 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Marathi (http://www.transifex.net/projects/p/yum/team/mr/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Marathi (http://www.transifex.net/projects/p/yum/team/mr/)\n" ++"Language-Team: Marathi (http://www.transifex.net/projects/p/yum/language/mr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,413 +17,438 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -80969,31 +82887,31 @@ index 5163eab..88cbe8e 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -81020,7 +82938,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -81030,69 +82948,69 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -81103,98 +83021,98 @@ index 5163eab..88cbe8e 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -81202,7 +83120,7 @@ index 5163eab..88cbe8e 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -81211,13 +83129,13 @@ index 5163eab..88cbe8e 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -81227,12 +83145,12 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -81242,12 +83160,12 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -81257,14 +83175,14 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -81272,13 +83190,13 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -81286,7 +83204,7 @@ index 5163eab..88cbe8e 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -81294,151 +83212,151 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -81448,18 +83366,18 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -81469,37 +83387,37 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -81508,353 +83426,353 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -81862,157 +83780,157 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -82020,33 +83938,33 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -82057,77 +83975,77 @@ index 5163eab..88cbe8e 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -82136,271 +84054,271 @@ index 5163eab..88cbe8e 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +968,536 @@ msgid "" +@@ -935,484 +968,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -82409,17 +84327,17 @@ index 5163eab..88cbe8e 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -82432,224 +84350,224 @@ index 5163eab..88cbe8e 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -82657,7 +84575,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -82665,7 +84583,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -82673,7 +84591,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -82681,43 +84599,49 @@ index 5163eab..88cbe8e 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -82743,7 +84667,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -82797,7 +84721,7 @@ index 5163eab..88cbe8e 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1505,47 @@ msgid "" +@@ -1420,47 +1511,47 @@ msgid "" "%s" msgstr "" @@ -82854,7 +84778,7 @@ index 5163eab..88cbe8e 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1557,7 @@ msgstr "" +@@ -1472,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -82863,7 +84787,7 @@ index 5163eab..88cbe8e 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1574,480 @@ msgid "" +@@ -1489,451 +1580,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -83033,14 +84957,14 @@ index 5163eab..88cbe8e 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -83160,153 +85084,153 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -83314,7 +85238,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -83322,148 +85246,148 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2058,106 @@ msgstr "" +@@ -1944,100 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -83508,226 +85432,226 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2165,1028 @@ msgstr "" +@@ -2045,991 +2171,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -83735,43 +85659,43 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -83984,7 +85908,7 @@ index 5163eab..88cbe8e 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -83995,40 +85919,46 @@ index 5163eab..88cbe8e 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -84036,23 +85966,23 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -84066,67 +85996,67 @@ index 5163eab..88cbe8e 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -84136,26 +86066,26 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -84165,62 +86095,62 @@ index 5163eab..88cbe8e 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -84228,79 +86158,79 @@ index 5163eab..88cbe8e 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -84308,118 +86238,118 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -84427,7 +86357,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -84435,118 +86365,118 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -84560,7 +86490,7 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -84572,29 +86502,29 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -84602,29 +86532,29 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -84632,117 +86562,117 @@ index 5163eab..88cbe8e 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -84842,10 +86772,15 @@ index 5163eab..88cbe8e 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3195,14 @@ msgstr "" +@@ -3038,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -84857,8 +86792,14 @@ index 5163eab..88cbe8e 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3243,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/ms.po b/po/ms.po -index 2b9119e..10fae84 100644 +index 2b9119e..7614e99 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2,13 +2,14 @@ @@ -84869,12 +86810,13 @@ index 2b9119e..10fae84 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -84884,7 +86826,7 @@ index 2b9119e..10fae84 100644 "Plural-Forms: nplurals=1; plural=0\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -84895,31 +86837,31 @@ index 2b9119e..10fae84 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -84946,7 +86888,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -84956,69 +86898,69 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -85028,98 +86970,98 @@ index 2b9119e..10fae84 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -85127,7 +87069,7 @@ index 2b9119e..10fae84 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -85135,13 +87077,13 @@ index 2b9119e..10fae84 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -85150,12 +87092,12 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -85164,12 +87106,12 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -85178,27 +87120,27 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -85206,158 +87148,158 @@ index 2b9119e..10fae84 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -85366,18 +87308,18 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -85386,37 +87328,37 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -85425,353 +87367,353 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ya" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "t" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "tidak" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Adakah ini ok [y/T]:" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -85779,190 +87721,190 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" +msgstr[0] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versi" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Saiz" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -85973,76 +87915,76 @@ index 2b9119e..10fae84 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -86051,271 +87993,271 @@ index 2b9119e..10fae84 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +957,536 @@ msgid "" +@@ -935,484 +957,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -86324,17 +88266,17 @@ index 2b9119e..10fae84 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -86347,224 +88289,224 @@ index 2b9119e..10fae84 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -86572,7 +88514,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -86580,7 +88522,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -86588,7 +88530,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -86596,43 +88538,49 @@ index 2b9119e..10fae84 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -86658,7 +88606,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -86712,7 +88660,7 @@ index 2b9119e..10fae84 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1494,47 @@ msgid "" +@@ -1420,47 +1500,47 @@ msgid "" "%s" msgstr "" @@ -86769,7 +88717,7 @@ index 2b9119e..10fae84 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1546,7 @@ msgstr "" +@@ -1472,7 +1552,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -86778,7 +88726,7 @@ index 2b9119e..10fae84 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1563,480 @@ msgid "" +@@ -1489,451 +1569,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -86944,14 +88892,14 @@ index 2b9119e..10fae84 100644 -#: ../yumcommands.py:435 -msgid "Setting up Group Process" --msgstr "" -- --#: ../yumcommands.py:441 --msgid "No Groups on which to run command" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:441 +-msgid "No Groups on which to run command" +-msgstr "" +- -#: ../yumcommands.py:454 -msgid "List available package groups" -msgstr "" @@ -87075,153 +89023,153 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -87229,7 +89177,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -87237,148 +89185,148 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2047,106 @@ msgstr "" +@@ -1944,100 +2053,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -87423,226 +89371,226 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2154,1026 @@ msgstr "" +@@ -2045,991 +2160,1027 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -87650,43 +89598,43 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -87899,7 +89847,7 @@ index 2b9119e..10fae84 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -87910,40 +89858,46 @@ index 2b9119e..10fae84 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -87951,23 +89905,23 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Tidak dapat melaksanakan checksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "menggunakan salinan tempatan bagi %s" @@ -87981,67 +89935,67 @@ index 2b9119e..10fae84 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Pengepala tidak lengkap." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Masalah membuka pakej %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Pakej %s tidak ditandatangan" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Tidak dapat membuang %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Tidak dapat membuang %s fail %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s fail %s dibuang" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s fail dibuang" @@ -88050,26 +90004,26 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Mencari %d pakej" @@ -88078,62 +90032,62 @@ index 2b9119e..10fae84 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "mencari pakej %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -88141,79 +90095,79 @@ index 2b9119e..10fae84 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Tiada Pakej dijumpai untuk %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -88221,118 +90175,118 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Mengemaskini Semuanya" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Memeriksa %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -88340,7 +90294,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -88348,118 +90302,118 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Menanda %s untuk dipasang" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Tidak dapat membuka fail: %s. Melangkau." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -88473,7 +90427,7 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -88485,29 +90439,29 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Kekunci berjaya diimport" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -88515,29 +90469,29 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -88545,117 +90499,117 @@ index 2b9119e..10fae84 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Ralat Ujian Transaksi:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -88755,10 +90709,15 @@ index 2b9119e..10fae84 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3182,14 @@ msgstr "" +@@ -3038,6 +3189,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -88770,8 +90729,14 @@ index 2b9119e..10fae84 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3230,3 @@ msgstr "Pengepala Rosak %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Ralat membuka rpm %s - ralat %s" +- +- diff --git a/po/nb.po b/po/nb.po -index d2ee996..a23b775 100644 +index d2ee996..19a9f7a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2,13 +2,14 @@ @@ -88782,22 +90747,23 @@ index d2ee996..a23b775 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,122 +17,124 @@ msgstr "" +@@ -16,926 +17,942 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Oppdaterer" @@ -88808,31 +90774,31 @@ index d2ee996..a23b775 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installerer" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Utgått" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Oppdatert" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Fjernet" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Installert" @@ -88859,7 +90825,7 @@ index d2ee996..a23b775 100644 msgstr "Fjernet: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Fjerner" @@ -88869,69 +90835,69 @@ index d2ee996..a23b775 100644 msgstr "Rydder opp" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Kommando «%s» er allerede definert" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Konfigurerer lagre" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Leser inn data om lager fra lokale filer" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Feil i konfigurasjon: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Feil i flagg: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "Installert: %s-%s til %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Bygd : %s til %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "Sendt inn: %s til %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Du må oppgi en kommando" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Krav til disk:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -88942,102 +90908,104 @@ index d2ee996..a23b775 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -139,60 +142,60 @@ msgstr "" - "Sammendrag for feil\n" - "---------------------\n" +-msgstr "" +-"Sammendrag for feil\n" +-"---------------------\n" ++msgstr "Sammendrag for feil\n---------------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Prøver å kjøre transaksjonen, men den er tom. Avslutter." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Avslutter på grunn av kommando fra bruker" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Laster ned pakker:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Kunne ikke laste ned pakkene:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Vennligst rapporter denne feilen i %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Kjører test på transaksjonen" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Feil ved test av transaksjonen:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Test av transaksjonen var vellykket" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Utfører transaksjonen" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -200,237 +203,260 @@ msgstr "" - "Nekter å importere nøkler automatisk ved kjøring uten oppsyn.\n" - "Bruk «-y» for å overstyre." +-msgstr "" +-"Nekter å importere nøkler automatisk ved kjøring uten oppsyn.\n" +-"Bruk «-y» for å overstyre." ++msgstr "Nekter å importere nøkler automatisk ved kjøring uten oppsyn.\nBruk «-y» for å overstyre." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Du mente kanskje:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pakken(e) %s%s%s er tilgjengelig, men ikke installert." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Pakke %s%s%s er ikke tilgjengelig." @@ -89045,7 +91013,7 @@ index d2ee996..a23b775 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pakke(r) som skal installeres" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -89054,13 +91022,13 @@ index d2ee996..a23b775 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Ingenting å gjøre" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakker merket for oppdatering" @@ -89070,12 +91038,12 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Ingen pakker merket for oppdatering" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -89085,12 +91053,12 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakker merket for fjerning" @@ -89100,14 +91068,14 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Ingen pakker merket for fjerning" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pakke(r) som skal nedgraderes" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -89115,13 +91083,13 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (fra %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Den installerte pakken %s%s%s%s er ikke tilgjengelig." @@ -89129,7 +91097,7 @@ index d2ee996..a23b775 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pakke(r) som skal ominstalleres" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -89137,153 +91105,154 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Ingen pakker ble tilbudt" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Pakke(r) som skal installeres" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Advarsel: Ingen treff funnet for: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Fant ingen treff" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Ingen pakke ble funnet for %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Rydder opp alt" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Rydder opp pakkehoder" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Rydder opp pakker" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Rydder opp i XML-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Rydder opp i mellomlager for database" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Rydder opp i metadata for expire-cache" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Rydder opp i programtillegg" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Installerte grupper:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Tilgjengelig grupper:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Ferdig" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Advarsel: Gruppe %s eksisterer ikke." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Ingen pakker tilgjengelig for installering eller oppdatering i aktuelle " - "grupper" +-msgstr "" +-"Ingen pakker tilgjengelig for installering eller oppdatering i aktuelle " +-"grupper" ++msgstr "Ingen pakker tilgjengelig for installering eller oppdatering i aktuelle grupper" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakke(r) vil bli installert" @@ -89293,18 +91262,18 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Det finnes ingen gruppe med navn %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Ingen pakker å fjerne fra grupper" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakker vil bli fjernet" @@ -89314,941 +91283,956 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakke %s er allerede lagt inn, hopper over" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Vraker pakke som ikke kan sammenlignes %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Ingen annen %s er lagt inn, legger til pakke til liste over potensielle " - "pakker" +-msgstr "" +-"Ingen annen %s er lagt inn, legger til pakke til liste over potensielle " +-"pakker" ++msgstr "Ingen annen %s er lagt inn, legger til pakke til liste over potensielle pakker" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Programtilleggs valg" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Feil med kommandolinje: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -441,284 +467,288 @@ msgstr "" "\n" - "%s: flagg %s krever et argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: flagg %s krever et argument" ++msgstr "\n\n%s: flagg %s krever et argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color tar et av: auto, alltid, aldri" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "vis denne hjelpteksten og avslutt" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "vær tolerant ved feil" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "plassering av konfigurasjonsfil" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maksimaltid for å vente på kommando" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "nivå for tilbakemeldinger ved avlusing" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "vis duplikater i lager og i kommandoer for å liste/søke i pakker" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "mengde tilbakemelding ved feil" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "stille operasjon" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "vis ekstra informasjon" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "svar Ja til alle spørsmål" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "vis Yum-versjon og avslutt" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "sett rot for installasjonen" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "legger til et eller flere lager (jokertegn er tillatt)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "slå av et eller flere lager (jokertegn er tillatt)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "overse pakke(r) ved navn eller mønster" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "fjerner ekskludering av pakker, for et lager eller alle pakker" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "ta med foreldede pakker i beregningen ved oppdatering" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "ikke bruk programtilleggene til Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "ikke sjekk GPG-signaturer" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "slå av tillegg til yum etter navn" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "slå av programtillegg til yum etter navn" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "hopp over pakker som har problemer med avhengigheter" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontroller om farger er brukt" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "mai" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "aug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "okt" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "des" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Prøver et annet speil." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Arkiv : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "Nettadresse : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Beskrivelse : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "j" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ja" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "nei" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Er dette ok [j/N]:" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -727,154 +757,156 @@ msgstr "" - "\n" - "Gruppe:%s" + "Group: %s" +-msgstr "" +-"\n" +-"Gruppe:%s" ++msgstr "\nGruppe:%s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "GruppeId:%s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Beskrivelse: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "Obligatoriske pakker:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "Standard pakker:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "Valgfrie pakker:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "Betingede pakker:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "pakke: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Ingen avhengigheter for denne pakka" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " avhengighet: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " avhengighet som ikke kunne tilfredstilles" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Treff fra:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Lisens : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Filnavn : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Andre ting : %s" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Kunne ikke finne ut størrelse på det som skal hentes ned" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Totale størrelse: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Totale størrelse på pakker som hentes: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Ominstallerer" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Nedgraderer" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Legges inn på grunn avhengigheter" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Oppdateres på grunn avhengigheter" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Fjernes på grunn avhengigheter" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Hoppet over (problemer med avhengigheter)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Pakke" +msgid_plural "Packages" -+msgstr[0] "Pakke" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Pakke" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arkitektur" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versjon" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Pakkeoversikt" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Størrelse" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -885,57 +917,58 @@ msgstr "" - "Transaksjonsammendrag\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Transaksjonsammendrag\n" +-"%s\n" ++msgstr "\nTransaksjonsammendrag\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Fjernet" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Fjernet på grunn avhengighet" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Lagt inn på grunn av avhengighet" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Oppdatert på grunn avhengighet" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Erstattet" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Feilet" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "to" -@@ -943,7 +976,7 @@ msgstr "to" +@@ -943,501 +960,550 @@ msgstr "to" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -954,470 +987,522 @@ msgstr "" - " Pågående nedlastning er avbrutt, %s avbryt (ved å trykke Ctrl-C) %s ganger til innen %s%s%s sekunder\n" - "for å avslutte.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Pågående nedlastning er avbrutt, %s avbryt (ved å trykke Ctrl-C) %s ganger til innen %s%s%s sekunder\n" +-"for å avslutte.\n" ++msgstr "\n Pågående nedlastning er avbrutt, %s avbryt (ved å trykke Ctrl-C) %s ganger til innen %s%s%s sekunder\nfor å avslutte.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "avbrutt av bruker" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Totalt" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -90257,17 +92241,17 @@ index d2ee996..a23b775 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -90280,224 +92264,224 @@ index d2ee996..a23b775 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installert" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "fjernet" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "oppdatert" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "foreldet" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Utfører sjekk av transaksjonen" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Starter løsing av avhengigheter på nytt med endringer" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Alle avhengigheter er løst" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Beregner avhengighet: %s for pakke: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Avhengigheter som ikke kunne bli tilfredstilt: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -90505,7 +92489,7 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -90513,7 +92497,7 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -90521,7 +92505,7 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -90529,43 +92513,49 @@ index d2ee996..a23b775 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Beregner konflikter: %s er i konflikt med %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Fyller transaksjonen med valgte pakker. Vennligst vent." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Henter ned filhode for pakke %s for å fylle transaksjonen." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Kjører" @@ -90591,7 +92581,7 @@ index d2ee996..a23b775 100644 msgstr "Sporet/Stoppet" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Ukjent" @@ -90629,25 +92619,31 @@ index d2ee996..a23b775 100644 msgid "" "\n" "\n" -@@ -1427,7 +1512,7 @@ msgstr "" - "\n" - "Avslutter etter ønske" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Avslutter etter ønske" ++msgstr "\n\nAvslutter etter ønske" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1437,7 +1522,7 @@ msgstr "" - "\n" - "Avslutter på grunn av brutt rør" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Avslutter på grunn av brutt rør" ++msgstr "\n\nAvslutter på grunn av brutt rør" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1445,41 +1530,41 @@ msgid "" +@@ -1445,49 +1511,47 @@ msgid "" "%s" msgstr "" @@ -90697,16 +92693,17 @@ index d2ee996..a23b775 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1487,7 +1572,7 @@ msgstr "" - "\n" - "Alle avhengigheter er løst" +-msgstr "" +-"\n" +-"Alle avhengigheter er løst" ++msgstr "\nAlle avhengigheter er løst" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Ferdig!" -@@ -1499,7 +1584,7 @@ msgstr "" +@@ -1499,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Du må være rootbruker for å utføre denne kommandoen." @@ -90715,9 +92712,23 @@ index d2ee996..a23b775 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1527,360 +1612,349 @@ msgstr "" +@@ -1514,471 +1578,482 @@ msgid "" + "will install it for you.\n" "\n" - "Kontakt din distribusjon eller pakkeansvarlig for mer informasjon.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Du har valgt å sjekke pakkene ved hjelp av GPG-nøkler. Det er fornuftig.\n" +-"Du har imidlertid ingen offentlige GPG-nøkler installert\n" +-"Du må hente ned og legge inn nøklene. Du kan legge dem inn med kommandoen:\n" +-"\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"Et annet og bedre alternativ er å oppgi URL til de nøklene du vil bruke.\n" +-"Bruk opsjonen 'gpgkey' for hvert lager for å ta dette i bruk.\n" +-"\n" +-"Kontakt din distribusjon eller pakkeansvarlig for mer informasjon.\n" ++msgstr "\nDu har valgt å sjekke pakkene ved hjelp av GPG-nøkler. Det er fornuftig.\nDu har imidlertid ingen offentlige GPG-nøkler installert\nDu må hente ned og legge inn nøklene. Du kan legge dem inn med kommandoen:\n\n rpm --import public.gpg.key\n\nEt annet og bedre alternativ er å oppgi URL til de nøklene du vil bruke.\nBruk opsjonen 'gpgkey' for hvert lager for å ta dette i bruk.\n\nKontakt din distribusjon eller pakkeansvarlig for mer informasjon.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -90768,8 +92779,9 @@ index d2ee996..a23b775 100644 +#: ../yumcommands.py:167 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "" - "Filen %s som ble gitt som argument til kommandoen shell eksisterer ikke." +-msgstr "" +-"Filen %s som ble gitt som argument til kommandoen shell eksisterer ikke." ++msgstr "Filen %s som ble gitt som argument til kommandoen shell eksisterer ikke." -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 @@ -91014,312 +93026,318 @@ index d2ee996..a23b775 100644 msgstr "Viser de pakkeoversiktene som er satt opp" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "aktiv" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "inaktiv" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Arkivrevisjon: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Arkivdistribusjonsmerkelapper:" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Arkivmetalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Oppdatert : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "arkiv id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "arkiv navn" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Viser en hjelpetekst" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Ingen hjelp er tilgjengelig for %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1890,7 +1964,7 @@ msgstr "" - "\n" - "alias:" + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"alias:" ++msgstr "\n\nalias:" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1900,85 +1974,125 @@ msgstr "" - "\n" - "alias:" + "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias:" ++msgstr "\n\nalias:" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Klargjør for å legge inn pakke(r) på nytt" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "ominstaller en pakke " -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Klargjør for oppdatering" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "nedgrader en pakke" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Vi sen versjon for maskinen og/eller tilgjengelige arkiver" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Installert:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Tilgjengelig:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1989,27 +2103,33 @@ msgstr "" +@@ -1989,104 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -91339,8 +93357,7 @@ index d2ee996..a23b775 100644 +#: ../yummain.py:128 +msgid "" +"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "" -+"Et annet program holder en fillås for Yum, venter til fillåsen frigjøres..." ++msgstr "Et annet program holder en fillås for Yum, venter til fillåsen frigjøres..." + #. Depsolve stage -#: ../yummain.py:167 @@ -91362,277 +93379,283 @@ index d2ee996..a23b775 100644 msgid "" "\n" "\n" -@@ -2019,74 +2139,74 @@ msgstr "" - "\n" - "Avslutter etter ønske" + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Avslutter etter ønske" ++msgstr "\n\nAvslutter etter ønske" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 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:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Setter opp transaksjons-sett før config klassen er klar" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Ugyldig tsflag in konfigurasjonsfil: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Søker i pkgSack etter avhengighet: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Medlem: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s ble omdannet til installering" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Legger til pakke %s in modus %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Fjerner pakke %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s krever: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Nødvendig avhengighet har allerede blitt plukket opp, jukser" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, 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:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Potensiell tilbyder: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Modus er %s for tilbyder av %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modus for pakke som tilbyr %s: %s" -@@ -2094,115 +2214,115 @@ msgstr "Modus for pakke som tilbyr %s: %s" +@@ -2094,1016 +2171,1029 @@ msgstr "Modus for pakke som tilbyr %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, 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:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, 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:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Oppdaterer %s for å løse opp i avhengighet." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, 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:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Hurtigpasset %s for å tilfredstille %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, 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:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." - msgstr "" - "Pakke %s som potensielt løser opp avhengighet har nyere instans in ts." +-msgstr "" +-"Pakke %s som potensielt løser opp avhengighet har nyere instans in ts." ++msgstr "Pakke %s som potensielt løser opp avhengighet har nyere instans in ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, 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:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s er allerde i ts, hopper over denne" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Setter opp %s som oppdatering av %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Setter opp %s som pakke for installering av %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Suksess - transaksjonen er tom" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Starter sløyfe på nytt" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Beregning av avhengighet avsluttes" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Suksess - alle avhengigheter er tilfredstilt" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Sjekker avhengigheter for %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "leter etter %s som kreves av %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Kjører compare_providers() for %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "bedre arch i po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s faser ut %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2211,142 +2331,142 @@ msgstr "" - "archdist sammenlignet %s med %s på %s\n" - " Vinner: %s" + " Winner: %s" +-msgstr "" +-"archdist sammenlignet %s med %s på %s\n" +-" Vinner: %s" ++msgstr "archdist sammenlignet %s med %s på %s\n Vinner: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "felles kilderpm %s og %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "felles prefiks fra %s mellom %s og %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Beste rekkefølge: %s" @@ -91765,9 +93788,10 @@ index d2ee996..a23b775 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2354,21 +2474,21 @@ msgstr "" - "Det er uferdige transaksjoner igjen. Du vil kanskje vurdere å kjøre yum-" - "complete-transaction først for å gjøre dem ferdig." +-msgstr "" +-"Det er uferdige transaksjoner igjen. Du vil kanskje vurdere å kjøre yum-" +-"complete-transaction først for å gjøre dem ferdig." ++msgstr "Det er uferdige transaksjoner igjen. Du vil kanskje vurdere å kjøre yum-complete-transaction først for å gjøre dem ferdig." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -91791,9 +93815,10 @@ index d2ee996..a23b775 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2376,128 +2496,120 @@ msgstr "" - "\n" - "Pakker som ble oversett på grunn av problemer med avhengigheter:" +-msgstr "" +-"\n" +-"Pakker som ble oversett på grunn av problemer med avhengigheter:" ++msgstr "\nPakker som ble oversett på grunn av problemer med avhengigheter:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -91827,9 +93852,10 @@ index d2ee996..a23b775 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Advarsel: et scriptlet eller andre ikkekritiske feil oppstod under " - "transaksjonen." +-msgstr "" +-"Advarsel: et scriptlet eller andre ikkekritiske feil oppstod under " +-"transaksjonen." ++msgstr "Advarsel: et scriptlet eller andre ikkekritiske feil oppstod under transaksjonen." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -91851,7 +93877,7 @@ index d2ee996..a23b775 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s var ment til å bli installert men er ikke!" @@ -91862,24 +93888,22 @@ index d2ee996..a23b775 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s var ment til å bli fjernet men er ikke!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Kunne ikke sjekke om PID %s er aktiv" - +-#, 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:1789 +#: ../yum/__init__.py:1917 @@ -91889,13 +93913,25 @@ index d2ee996..a23b775 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Kunne ikke sjekke om PID %s er aktiv" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -91903,23 +93939,23 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Kunne ikke beregne sjekksum" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Pakken har ikke korrekt sjekksum" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "sjekksummen til pakken er feil, men mellomlagring er satt på for %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "bruker lokal kopi av %s" @@ -91936,69 +93972,70 @@ index d2ee996..a23b775 100644 -" * trenger %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Filhode er ikke fullstendig." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2505,62 +2617,64 @@ msgstr "" - "Filhode er ikke tilgjengelig lokalt og mellomlager-modus er aktivert Kan " - "ikke hente ned %s" +-msgstr "" +-"Filhode er ikke tilgjengelig lokalt og mellomlager-modus er aktivert Kan " +-"ikke hente ned %s" ++msgstr "Filhode er ikke tilgjengelig lokalt og mellomlager-modus er aktivert Kan ikke hente ned %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Offentlig nøkkel for %s er ikke lagt inn" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problem ved åpning av pakke %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Offentlig nøkkel %s er ikke til å stole på" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Pakken %s er ikke signert" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Kan ikke fjerne %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s fjernet" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Kan ikke fjerne %s fra fil %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s fil %s er fjernet" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s filer fjernet" @@ -92008,28 +94045,29 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mer enn ett identisk passende treff i sekken %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, 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:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2568,203 +2682,212 @@ msgstr "" - "searchPackages() vil forsvinne i en kommende utgave av Yum.\n" - "Bruk heller searchGenerator()\n" +-msgstr "" +-"searchPackages() vil forsvinne i en kommende utgave av Yum.\n" +-"Bruk heller searchGenerator()\n" ++msgstr "searchPackages() vil forsvinne i en kommende utgave av Yum.\nBruk heller searchGenerator()\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Søker etter %d pakker" @@ -92039,62 +94077,62 @@ index d2ee996..a23b775 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "søker etter pakke %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "søker i filoversikt" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "søker i oppføringer av tilbud" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Ingen gruppedata tilgjengelig for konfigurerte pakkelager" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Det eksisterer ingen gruppe med navn %s " -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "pakke %s var ikke med i gruppe %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Legger til pakke %s fra gruppe %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Ingen pakke med navn %s er tilgjendelig for installering" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -92102,79 +94140,79 @@ index d2ee996..a23b775 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, 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:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Ingen pakke for %s er funnet" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Pakkeobjekt var ikke en pakkeobjektinstans" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Ingenting oppgitt for installasjon" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, 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:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Ingen treff for argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Pakke %s er installert og ikke tilgjengelig" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Ingen pakke(r) er tilgjengelig for installering" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakke: %s - allerede i transaksjonensettet" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Pakke %s er foreldet av %s som allerede er installert" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -92182,62 +94220,62 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Pakke %s er foreldet av %s, prøver å installere %s isteden." -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakke %s er allerede installert i siste versjon" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Pakke med treff på %s er allerede lagt inn. Ser etter oppdatering" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Oppdaterer alt" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, 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" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, 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:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Oppdatere ikke pakken som allerede er oppdatert: %s.%s %s:%s-%s" @@ -92245,67 +94283,70 @@ index d2ee996..a23b775 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Kunne ikke finne noen passende pakke for fjerning" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Undersøker: %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2772,12 +2895,12 @@ msgstr "" - "Kan ikke legge til pakke %s til transaksjonen. Det er ikke en kompatibel " - "arkitektur: %s" +-msgstr "" +-"Kan ikke legge til pakke %s til transaksjonen. Det er ikke en kompatibel " +-"arkitektur: %s" ++msgstr "Kan ikke legge til pakke %s til transaksjonen. Det er ikke en kompatibel arkitektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2786,137 +2909,144 @@ msgstr "" - "Pakka %s er ikke installert, så den kan ikke oppdateres. Bruk kommandoen yum" - " install for å legge den inn." + "instead." +-msgstr "" +-"Pakka %s er ikke installert, så den kan ikke oppdateres. Bruk kommandoen yum" +-" install for å legge den inn." ++msgstr "Pakka %s er ikke installert, så den kan ikke oppdateres. Bruk kommandoen yum install for å legge den inn." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -92313,118 +94354,118 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Ekskluderer %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Setter av %s for kommende installering" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Setter av %s som en oppdatering av %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: vil ikke oppdatere installert pakke." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Kunne ikke åpne fil: %s. Hopper over." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem ved reinstall: kunne ikke finne passende pakke og fjerne" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem i ominstalleringen: ingen pakke %s funnet for installering." -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Ingen pakke(r) er tilgjengelig for nedgradering" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakke %s er tillatt flere installeringer, hopper over." -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Ingen treff for tilgjengelig pakke: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Bare oppgraderinger tilgjengelig på pakke: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Henting av GPG-nøkkel feilet: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Analyse av GPG-nøkkel feilet: nøkkelen har ikke verdi %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -92438,7 +94479,7 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -92450,60 +94491,64 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-nøkkel ved %s (0x%s) er allerede lagt inn" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Import av nøkkel feilet (kode %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Nøkler ble lagt inn med suksess" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2927,183 +3057,207 @@ msgstr "" - "Sjekk at korrekt URL (gpgkey opsjonen) er oppgitt for denne\n" - "pakkeoversikten." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG-nøkkelen for pakkeoversikten %s er allerede lagt inn, men\n" +-"nøkkelen passer ikke til den aktuelle pakka fra samme oversikt.\n" +-"Sjekk at korrekt URL (gpgkey opsjonen) er oppgitt for denne\n" +-"pakkeoversikten." ++msgstr "GPG-nøkkelen for pakkeoversikten %s er allerede lagt inn, men\nnøkkelen passer ikke til den aktuelle pakka fra samme oversikt.\nSjekk at korrekt URL (gpgkey opsjonen) er oppgitt for denne\npakkeoversikten." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import av nøkler hjalp ikke, feil nøkler?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-nøkkel ved %s (0x%s) er allerede importert" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Import av nøkkel feilet" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -92511,117 +94556,117 @@ index d2ee996..a23b775 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Kunne ikke finne passende filspeil" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Det oppstod feil ved nedlastning av pakker." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Vennligst send en feilrapport til %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Feil ved testtransaksjon: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -92673,8 +94718,9 @@ index d2ee996..a23b775 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Det finnes to eller flere tillegg med navn «%s» i søkestien for tillegg" +-msgstr "" +-"Det finnes to eller flere tillegg med navn «%s» i søkestien for tillegg" ++msgstr "Det finnes to eller flere tillegg med navn «%s» i søkestien for tillegg" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -92722,26 +94768,34 @@ index d2ee996..a23b775 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3112,6 +3266,17 @@ msgstr "" +@@ -3112,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "Pakker på nytt" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Det er ikke nok ledig plass i nedlastingskatalogen %s\n" -+" * ledig %s \n" -+" * trenger %s" ++msgstr "Det er ikke nok ledig plass i nedlastingskatalogen %s\n * ledig %s \n * trenger %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3140,5 +3243,3 @@ 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" +- +- diff --git a/po/pa.po b/po/pa.po -index e714500..1a5c220 100644 +index e714500..8536b45 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2,14 +2,15 @@ @@ -92750,26 +94804,27 @@ index e714500..1a5c220 100644 # -# A S Alam , 2011 +# Translators: -+# A S Alam , 2011. ++# A S Alam , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" -+"Last-Translator: james \n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2012-02-23 02:01+0000\n" ++"Last-Translator: A S Alam \n" "Language-Team: Panjabi (Punjabi) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" +@@ -17,922 +18,942 @@ msgstr "" "Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" @@ -92780,31 +94835,31 @@ index e714500..1a5c220 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "ਅੱਪਡੇਟ ਕੀਤੇ" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "ਸਾਫ਼ ਕੀਤਾ" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "ਇੰਸਟਾਲ ਕੀਤਾ" @@ -92831,7 +94886,7 @@ index e714500..1a5c220 100644 msgstr "ਸਾਫ਼ ਕੀਤਾ: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" @@ -92841,176 +94896,178 @@ index e714500..1a5c220 100644 msgstr "ਸਾਫ਼" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "ਕਮਾਂਡ \"%s\" ਪਹਿਲਾਂ ਦੀ ਦਿੱਤੀ ਹੈ" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "ਰਿਪੋਜ਼ਟਰੀਆਂ ਸੈਟਅੱਪ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "ਲੋਕਲ ਫਾਇਲਾਂ ਤੋਂ ਰਿਪੋਜ਼ਟਰੀ ਮੇਟਾਡਾਟਾ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "ਸੰਰਚਨਾ ਗਲਤੀ: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "ਚੋਣ ਗਲਤੀ: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " ਇੰਸਟਾਲ ਕੀਤਾ:%s-%s %s ਉੱਤੇ " -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " ਬਿਲਡ : %s %s ਉੱਤੇ " -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " ਕਮਿਟ ਕੀਤਾ: %s %s ਉੱਤੇ" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਕਮਾਂਡ ਦੇਣ ਦੀ ਲੋੜ ਹੈ" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "ਇੰਝ ਦੀ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਹੈ: %s। %s --help ਵਰਤੋਂ ਜੀ" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "ਡਿਸਕ ਲੋੜਾਂ:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " ਘੱਟੋ-ਘੱਟ %dMB ਹੋਰ ਖਾਲੀ ਥਾਂ %s ਫਾਇਲ ਸਿਸਟਮ ਉੱਤੇ ਚਾਹੀਦੀ ਹੈ।\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] " ਘੱਟੋ-ਘੱਟ %dMB ਹੋਰ ਖਾਲੀ ਥਾਂ %s ਫਾਇਲ ਸਿਸਟਮ ਉੱਤੇ ਚਾਹੀਦੀ ਹੈ।\n" ++msgstr[0] "" +msgstr[1] " ਘੱਟੋ-ਘੱਟ %dMB ਹੋਰ ਖਾਲੀ ਥਾਂ %s ਫਾਇਲ ਸਿਸਟਮ ਉੱਤੇ ਚਾਹੀਦੀ ਹੈ।\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,294 +143,317 @@ msgstr "" - "ਗਲਤੀ ਸੰਖੇਪ\n" - "------------\n" +-msgstr "" +-"ਗਲਤੀ ਸੰਖੇਪ\n" +-"------------\n" ++msgstr "ਗਲਤੀ ਸੰਖੇਪ\n------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ, ਪਰ ਕੁਝ ਵੀ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ। ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ" - " ਹੈ।" +-msgstr "" +-"ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ, ਪਰ ਕੁਝ ਵੀ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ। ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ" +-" ਹੈ।" ++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ, ਪਰ ਕੁਝ ਵੀ ਕਰਨ ਲਈ ਨਹੀਂ ਹੈ। ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "ਯੂਜ਼ਰ ਕਮਾਂਡ ਮੌਜੂਦ ਹੈ" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" -msgstr "" +msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਚੱਲ ਰਿਹਾ ਹੈ" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ਗਲਤੀ, ਤੁਹਾਨੂੰ ਹੈਂਡਲ ਕਰਨ ਲਈ rpm ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਚੱਲ ਰਿਹਾ ਹੈ" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਗਲਤੀ:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਟੈਸਟ ਸਫ਼ਲ ਰਿਹਾ" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੱਲ ਰਹੀ ਹੈ" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * ਸ਼ਾਇਦ ਤੁਸੀਂ ਚਾਹੁੰਦੇ ਹੋ: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "ਪੈਕੇਜ %s%s%s ਉਪਲੱਬਧ ਹਨ, ਪਰ ਇੰਸਟਾਲ ਨਹੀਂ।" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "ਕੋਈ %s%s%s ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।" @@ -93018,37 +95075,37 @@ index e714500..1a5c220 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" ++msgstr[1] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "ਅੱਪਡੇਟ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਚੁਣਿਆ %d ਪੈਕੇਜ" ++msgstr[1] "ਅੱਪਡੇਟ ਲਈ ਚੁਣੇ %d ਪੈਕੇਜ" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "ਅੱਪਡੇਟ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" @@ -93058,43 +95115,43 @@ index e714500..1a5c220 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਮਾਰਕ ਨਹੀਂ ਕੀਤਾ" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ ਚੁਣੇ ਗਏ" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ %d ਪੈਕੇਜ" ++msgstr[1] "ਹਟਾਉਣ ਲਈ ਚੁਣੇ %d ਪੈਕੇਜ" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" ++msgstr[1] "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (%s ਵਲੋਂ)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ %s%s%s%s ਉਪਲੱਬਧ ਨਹੀਂ।" @@ -93102,785 +95159,795 @@ index e714500..1a5c220 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" ++msgstr[1] "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਦਿੰਦਾ" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "ਮਿਲਦੇ: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "ਚੇਤਾਵਨੀ: %s :ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "ਕੋਈ ਮਿਲਦਾ ਨਹੀਂ" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "ਰੈਪੋ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "ਹਰ ਚੀਜ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "ਹੈੱਡਰ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "ਪੈਕੇਜ ਸਾਫ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "xml ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "ਡਾਟਾਬੇਸ ਕੈਸ਼ ਸਾਫ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "ਐਕਸਪਾਇਰ-ਕੈਸ਼ ਮੇਟਾਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "ਕੈਸ਼ ਕੀਤਾ rpmdb ਡਾਟਾ ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "ਪਲੱਗਇਨ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "ਸਾਵਧਾਨ: ਕੋਈ ਮਿਲਦਾ ਗਰੁੱਪ ਨਹੀਂ: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "ਇੰਸਟਾਲ ਹੋਏ ਗਰੁੱਪ:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" -msgstr "" +msgstr "ਇੰਸਟਾਲ ਹੋਏ ਭਾਸ਼ਾ ਗਰੁੱਪ:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "ਉਪਲੱਬਧ ਗਰੁੱਪ:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" -msgstr "" +msgstr "ਉਪਲੱਬਧ ਭਾਸ਼ਾ ਗਰੁੱਪ:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "ਮੁਕੰਮਲ" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "ਚੇਤਾਵਨੀ: ਗਰੁੱਪ %s ਮੌਜੂਦ ਨਹੀਂ ਹੈ।" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "ਮੰਗੇ ਗਏ ਗਰੁੱਪ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਪੈਕੇਜ ਇੰਸਟਾਲ ਜਾਂ ਅੱਪਡੇਟ ਲਈ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" ++msgstr[1] "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %d ਪੈਕੇਜ" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "ਗਰੁੱਪ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" ++msgstr[1] "ਹਟਾਉਣ ਲਈ %d ਪੈਕੇਜ" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "ਪਲੱਗਇਨ ਚੋਣਾਂ" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "ਕਮਾਂਡ ਲਾਈਨ ਗਲਤੀ: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -438,284 +464,288 @@ msgstr "" "\n" - "%s:%s ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s:%s ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ" ++msgstr "\n\n%s:%s ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "ਇਹ ਮੱਦਦ ਸੁਨੇਹਾ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "ਪੂਰੀ ਤਰ੍ਹਾਂ ਸਿਸਟਮ ਕੈਸ਼ ਤੋਂ ਚਲਾਓ, ਕੈਸ਼ ਅੱਪਡੇਟ ਨਾ ਕਰੋ" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "ਸੰਰਚਨਾ ਫਾਇਲ ਟਿਕਾਣਾ" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "ਵੱਧੋ-ਵੱਧ ਕਮਾਂਡ ਉਡੀਕ ਸਮਾਂ" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "ਡੁਪਲੀਕੇਟ ਵੇਖੋ, ਰਿਪੋ ਵਿੱਚ, ਲਿਸਟ/ਖੋਜ ਕਮਾਂਡ ਵਿੱਚ" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "ਗਲਤੀ ਆਉਟਪੁੱਟ ਲੈਵਲ" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "rpm ਲਈ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਲੈਵਲ" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "ਚੁੱਪ-ਚਾਪ ਕਾਰਵਾਈ" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਕਾਰਵਾਈ" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "ਸਭ ਸਵਾਲਾਂ ਦੇ ਜਵਾਬ ਹਾਂ" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" -+msgstr "" ++msgstr "ਸਭ ਸਵਾਲਾਂ ਲਈ ਨਾਂਹ ਜਵਾਬ" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "ਯੱਮ ਵਰਜਨ ਵੇਖਾਓ ਅਤੇ ਬੰਦ ਕਰੋ" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "install root ਸੈੱਟ ਕਰੋ" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਚਾਲੂ ਕਰੋ (ਵਾਈਲਡਕਾਰਡ ਮਨਜ਼ੂਰ ਹਨ)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "ਇੱਕ ਜਾਂ ਵੱਧ ਰਿਪੋਜ਼ਟਰੀਆਂ ਬੰਦ (ਵਾਇਲਡਕਾਰਡ ਮਨਜ਼ੂਰ)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "ਅੱਪਡੇਟ ਦੇ ਦੌਰਾਨ ਬਰਤਰਫ਼ ਕਾਰਵਾਈਆਂ ਚਾਲੂ" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "ਯੱਮ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "gpg ਦਸਤਖਤ ਚੈੱਕ ਕਰਨਾ ਬੰਦ" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "ਨਾਂ ਨਾਲ ਪਲੱਗਇਨ ਬੰਦ ਕਰੋ" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "ਪਲੱਗਇਨ ਨਾਂ ਨਾਲ ਚਾਲੂ ਕਰੋ" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "ਨਿਰਭਰਤਾ ਸਮੱਸਿਆਵਾਂ ਵਾਲੇ ਪੈਕੇਜ ਛੱਡ ਦਿਉ" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਕੀ ਰੰਗ ਵਰਤਣੇ ਹਨ" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "ਯੱਮ ਸੰਰਚਨਾ ਤੇ ਰਿਪੋ ਫਾਇਲਾਂ 'ਚ $releasever ਦਾ ਮੁੱਲ ਸੈੱਟ ਕਰੋ" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "ਜਨ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "ਫਰ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "ਮਾਰ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "ਅਪ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "ਮਈ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "ਜੂਨ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "ਜੁਲਾ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "ਅਗ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "ਸਤੰ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "ਅਕ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "ਨਵੰ" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "ਦਸੰ" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "ਹੋਰ ਮਿੱਰਰ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਜਾਰੀ" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "ਨਾਂ : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "ਢਾਂਚਾ : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoch : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "ਵਰਜਨ : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "ਰੀਲਿਜ਼ : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "ਸਾਈਜ਼ : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "ਰਿਪੋ : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "ਰਿਪੋ ਤੋਂ : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "ਕਮਿੱਟਰ : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "ਕਮਿਟ-ਸਮਾਂ : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "ਬਿਲਡ ਸਮਾਂ : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "ਇੰਸਟਾਲ ਸਮਾਂ: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "ਇੰਸਟਾਲ ਇਸ ਵਲੋਂ: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "ਇਸ ਵਲੋਂ ਬਦਲਿਆ : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "ਸੰਖੇਪ : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "ਲਾਈਸੈਂਸ : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "ਵੇਰਵਾ: " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "yes" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "no" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "ਕੀ ਇਹ ਠੀਕ ਹੈ [y/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -724,154 +754,156 @@ msgstr "" - "\n" - "ਗਰੁੱਪ: %s" + "Group: %s" +-msgstr "" +-"\n" +-"ਗਰੁੱਪ: %s" ++msgstr "\nਗਰੁੱਪ: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " ਗਰੁੱਪ-Id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " ਵੇਰਵਾ: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr " ਭਾਸ਼ਾ: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " ਲਾਜ਼ਮੀ ਪੈਕੇਜ:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " ਡਿਫਾਲਟ ਪੈਕੇਜ:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " ਚੋਣਵੇਂ ਪੈਕੇਜ:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " ਸ਼ਰਤੀਆ ਪੈਕੇਜ:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "ਪੈਕੇਜ: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " ਇਹ ਪੈਕੇਜ ਲਈ ਕੋਈ ਨਿਰਭਰਤਾ ਨਹੀਂ ਹੈ" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " ਨਿਰਭਰਤਾ: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " ਨਾ-ਹੱਲ ਹੋਈ ਨਿਰਭਰਤਾ" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "ਇਸ ਤੋਂ ਮੇਲ:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "ਲਾਈਸੈਂਸ : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "ਫਾਇਲ ਨਾਂ : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "ਹੋਰ : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "ਕੁੱਲ ਡਾਊਨਲੋਡ ਆਕਾਰ ਲੱਭਣ ਦੌਰਾਨ ਗਲਤੀ" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "ਕੁੱਲ ਸਾਈਜ਼: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "ਕੁੱਲ ਡਾਊਨਲੋਡ ਸਾਈਜ਼: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "ਇੰਸਟਾਲ ਦਾ ਸਾਈਜ਼: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "ਇੰਸਟਾਲ ਆਕਾਰ ਗਿਣਨ ਦੌਰਾਨ ਗਲਤੀ" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "ਨਿਰਭਰਤਾ ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "ਨਿਰਭਰਤਾ ਲਈ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "ਨਿਰਭਰਤਾ ਲਈ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ (ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "ਇੰਸਟਾਲ ਨਹੀਂ" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "ਪੈਕੇਜ" +msgid_plural "Packages" -+msgstr[0] "ਪੈਕੇਜ" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "ਪੈਕੇਜ" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "ਢਾਂਚਾ" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "ਵਰਜਨ" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "ਰਿਪੋਜ਼ਟਰੀ" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "ਸਾਈਜ਼" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " %s%s%s.%s %s ਨੂੰ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -882,57 +914,58 @@ msgstr "" - "ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ ਜਾਣਕਾਰੀ\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ ਜਾਣਕਾਰੀ\n" +-"%s\n" ++msgstr "\nਟਰਾਂਸੈਕਸ਼ਨ ਸੰਖੇਪ ਜਾਣਕਾਰੀ\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "ਇੰਸਟਾਲ" @@ -93888,23 +95955,23 @@ index e714500..1a5c220 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "ਅੱਪਗਰੇਡ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" -+msgstr "" ++msgstr "ਅੱਪਗਰੇਡ" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "ਹਟਾਉਣੇ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" -+msgstr "" ++msgstr "ਹਟਾਓ" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "ਮੁੜ-ਇੰਸਟਾਲ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "ਮੁੜ-ਇੰਸਟਾਲ" @@ -93912,329 +95979,333 @@ index e714500..1a5c220 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "ਡਾਊਨਗਰੇਡ %5.5s ਪੈਕੇਜ\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "ਡਾਊਨਗਰੇਡ" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "ਨਿਰਭਰ ਪੈਕੇਜ" ++msgstr[1] "ਨਿਰਭਰ ਪੈਕੇਜ" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "ਹਟਾਏ" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "ਨਿਰਭਰਤਾ ਹਟਾਈ" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ ਕੀਤੀ" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "ਨਿਰਭਰਤਾ ਅੱਪਡੇਟ ਕੀਤੀ" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "ਬਦਲੇ ਗਏ" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "ਫੇਲ੍ਹ ਹੋਏ" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "ਦੋ" -@@ -940,7 +973,7 @@ msgstr "ਦੋ" +@@ -940,578 +961,610 @@ msgstr "ਦੋ" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -951,364 +984,416 @@ msgstr "" - " ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s ਸਕਿੰਟ ਵਿੱਚ\n" - "ਦਬਾਉ\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s ਸਕਿੰਟ ਵਿੱਚ\n" +-"ਦਬਾਉ\n" ++msgstr "\n ਮੌਜੂਦਾ ਡਾਊਨਲੋਡ ਰੱਦ ਕੀਤਾ ਗਿਆ, ਬੰਦ ਕਰਨ ਲਈ %sinterrupt (ctrl-c) %s %s%s%s ਸਕਿੰਟ ਵਿੱਚ\nਦਬਾਉ\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "ਯੂਜ਼ਰ ਵਲੋਂ ਦਖ਼ਲ" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "ਕੁੱਲ" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "<ਅਣ-ਸੈੱਟ>" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "ਸਿਸਟਮ" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "" +msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਨਹੀਂ" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕੇਜ ਦਿੱਤਾ" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "ਕਮਾਂਡ ਲਾਈਨ" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "ਲਾਗਇਨ ਯੂਜ਼ਰ" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "ਮਿਤੀ ਅਤੇ ਸਮਾਂ" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "ਐਕਸ਼ਨ" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "ਬਦਲੇ" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID ਦਿੱਤਾ" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "ਦਿੱਤਾ ਟਰਾਂਸੈਕਸ਼ਨ ID ਨਹੀਂ ਲੱਭਿਆ" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "ਇੱਕ ਤੋਂ ਵੱਧ ਟਰਾਂਸੈਕਸ਼ਨ ID ਲੱਭਿਆ!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕੇਜ ਨਹੀਂ ਦਿੱਤਾ" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "ਪੁਰਾਣੇ" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "ਨਵੇਂ" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "ਸ਼ੁਰੂ ਸਮਾਂ :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "rpmdb ਸ਼ੁਰੂ :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u ਸਕਿੰਟ)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u ਮਿੰਟ)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u ਘੰਟੇ)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u ਦਿਨ)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "ਅੰਤ ਸਮਾਂ :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "rpmdb ਅੰਤ :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "ਯੂਜ਼ਰ :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "ਰੀਟਰਨ-ਕੋਡ :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "ਅਧੂਰਾ ਛੱਡਿਆ" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" -msgstr "" +msgstr "ਫੇਲ੍ਹ:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "ਫੇਲ੍ਹ:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "ਸਫ਼ਲ" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "ਕਮਾਂਡ ਲਾਈਨ :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਕੀਤੀ ਗਈ ਇਸ ਨਾਲ:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "ਪੈਕੇਜ ਬਦਲੇ:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "ਪੈਕੇਜ ਛੱਡੇ ਗਏ:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb ਸਮੱਸਿਆਵਾਂ:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scriptlet ਆਉਟਪੁੱਟ:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "ਗਲਤੀਆਂ:" @@ -94243,17 +96314,17 @@ index e714500..1a5c220 100644 -msgstr "ਇੰਸਟਾਲ" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "ਨਿਰਭ-ਇੰਸਟਾਲ" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "ਸਾਫ਼" @@ -94266,302 +96337,318 @@ index e714500..1a5c220 100644 -msgstr "ਡਾਊਨਗਰੇਡ" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "ਅੱਪਡੇਟ" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "ਸਮਾਂ" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "ਪਿਛਲੇ ਦਿਨ" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "ਪਿਛਲੇ ਹਫ਼ਤੇ" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "ਪਿਛਲੇ ੨ ਹਫ਼ਤੇ" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "ਪਿਛਲੇ ੩ ਮਹੀਨੇ" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "ਪਿਛਲੇ ੬ ਮਹੀਨੇ" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "ਪਿਛਲੇ ਸਾਲ" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "ਲਗਭਗ ਸਾਲ ਪਹਿਲਾਂ" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ %s ਨਹੀਂ ਲੱਭੀ" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ID:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "ਉਪਲੱਬਧ ਹੋਰ ਅਤੀਤ ਜਾਣਕਾਰੀ:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: ਇਸ ਨਾਂ ਨਾਲ ਕੋਈ ਹੋਰ ਵਾਧੂ ਡਾਟਾ ਨਹੀਂ ਲੱਭਿਆ" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" -+msgstr "" ++msgstr "ਪੈਕੇਜ :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" -+msgstr "" ++msgstr "ਹਾਲਤ :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" -+msgstr "" ++msgstr "ਆਕਾਰ :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" -+msgstr "" ++msgstr "ਬਿਲਡ ਹੋਸਟ :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" -+msgstr "" ++msgstr "ਬਿਲਡ ਸਮਾਂ :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" -+msgstr "" ++msgstr "ਪੈਕੇਜਰ :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" -+msgstr "" ++msgstr "ਵੈਂਡਰ :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" -+msgstr "" ++msgstr "ਲਾਈਸੈਂਸ :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" -+msgstr "" ++msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" -+msgstr "" ++msgstr "ਸਰੋਤ RPM :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" -+msgstr "" ++msgstr "ਰੈਪੋ ਤੋਂ :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" -+msgstr "" ++msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਤੋਂ :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "ਇੰਸਟਾਲ ਕੀਤੇ" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" -msgstr "" +msgstr "ਇੱਕ ਅੱਪਡੇਟ" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "ਸਾਫ਼ ਕੀਤੇ" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤੇ" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" -msgstr "" +msgstr "ਡਾਊਨਗਰੇਡ" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" -msgstr "" +msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "ਅੱਪਡੇਟ ਕੀਤੇ" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> ਪੈਕੇਜ %s.%s %s:%s-%s ਹੋਵੇਗਾ %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> ਨਵੇਂ ਬਦਲਾਅ ਨਾਲ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਲਈ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> ਨਿਰਭਰਤਾ ਹੱਲ ਮੁਕੰਮਲ ਹੋਇਆ" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> ਨਿਰਭਰਤਾ ਲਈ ਕਾਰਵਾਈ ਜਾਰੀ: %s ਪੈਕੇਜ ਲਈ: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> ਪੈਕੇਜ ਰੱਖਿਆ ਜਾਂਦਾ ਹੈ: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> ਨਾ-ਹੱਲ਼ ਹੋਈ ਨਿਰਭਰਤਾ: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "ਪੈਕੇਜ: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1317,7 +1402,7 @@ msgstr "" - "\n" - " ਚਾਹੀਦਾ ਹੈ: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" ਚਾਹੀਦਾ ਹੈ: %s" ++msgstr "\n ਚਾਹੀਦਾ ਹੈ: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1326,7 +1411,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1335,7 +1420,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1344,87 +1429,87 @@ msgstr "" - " ਨਹੀਂ ਲੱਭਾ" +-msgstr "" +-"\n" +-" ਨਹੀਂ ਲੱਭਾ" ++msgstr "\n ਨਹੀਂ ਲੱਭਾ" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "ਅੱਪਡੇਟ ਕੀਤਾ" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤਾ" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "ਉਪਲੱਬਧ" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> ਅਪਵਾਦ ਹੱਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: %s ਦਾ %s ਨਾਲ ਟਕਰਾ" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> ਚੁਣੇ ਪੈਕੇਜਾਂ ਲਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ ਪਾਪੂਲੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ।" +-msgstr "" +-"--> ਚੁਣੇ ਪੈਕੇਜਾਂ ਲਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ ਪਾਪੂਲੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ।" ++msgstr "--> ਚੁਣੇ ਪੈਕੇਜਾਂ ਲਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ ਪਾਪੂਲੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ। ਉਡੀਕੋ ਜੀ।" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - "---> ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਪੈਕ ਕਰਨ ਲਈ %s ਵਾਸਤੇ ਹੈੱਡਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" +-msgstr "" +-"---> ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਪੈਕ ਕਰਨ ਲਈ %s ਵਾਸਤੇ ਹੈੱਡਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" ++msgstr "---> ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਪੈਕ ਕਰਨ ਲਈ %s ਵਾਸਤੇ ਹੈੱਡਰ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "ਜਾਂਚਿਆ ਜਾ ਰਿਹਾ ਹੈ" ++ +#: ../utils.py:129 msgid "Running" msgstr "ਚੱਲ ਰਿਹਾ ਹੈ" @@ -94587,7 +96674,7 @@ index e714500..1a5c220 100644 msgstr "ਟਰੇਸ ਕੀਤਾ/ਰੋਕਿਆ" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "ਅਣਜਾਣ" @@ -94625,36 +96712,47 @@ index e714500..1a5c220 100644 msgid "" "\n" "\n" -@@ -1434,7 +1519,7 @@ msgstr "" - "\n" - "ਯੂਜ਼ਰ ਰੱਦ ਕਰਨ ਉੱਤੇ ਮੌਜੂਦ" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"ਯੂਜ਼ਰ ਰੱਦ ਕਰਨ ਉੱਤੇ ਮੌਜੂਦ" ++msgstr "\n\nਯੂਜ਼ਰ ਰੱਦ ਕਰਨ ਉੱਤੇ ਮੌਜੂਦ" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1444,7 +1529,7 @@ msgstr "" - "\n" - "ਖਰਾਬ ਪਾਈਪ ਉੱਤੇ ਬੰਦ" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"ਖਰਾਬ ਪਾਈਪ ਉੱਤੇ ਬੰਦ" ++msgstr "\n\nਖਰਾਬ ਪਾਈਪ ਉੱਤੇ ਬੰਦ" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1455,7 +1540,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1463,35 +1548,35 @@ msgstr "" - "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; exit_on_lock ਵਲੋਂ ਸੰਰਚਨਾ ਮੁਤਾਬਕ " - "ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" +-msgstr "" +-"ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; exit_on_lock ਵਲੋਂ ਸੰਰਚਨਾ ਮੁਤਾਬਕ " +-"ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" ++msgstr "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਨ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; exit_on_lock ਵਲੋਂ ਸੰਰਚਨਾ ਮੁਤਾਬਕ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../utils.py:287 +#: ../utils.py:352 @@ -94695,9 +96793,10 @@ index e714500..1a5c220 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1499,19 +1584,19 @@ msgstr "" - "\n" - "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" +-msgstr "" +-"\n" +-"ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" ++msgstr "\nਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 @@ -94718,7 +96817,7 @@ index e714500..1a5c220 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1528,360 +1613,349 @@ msgid "" +@@ -1528,458 +1581,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -94820,8 +96919,9 @@ index e714500..1a5c220 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "ਸਭ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਨੂੰ ਸਭ ਤੋਂ ਨਵੇਂ ਉਪਲੱਬਧ ਵਰਜਨਾਂ ਨਾਲ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰੋ" +-msgstr "" +-"ਸਭ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਨੂੰ ਸਭ ਤੋਂ ਨਵੇਂ ਉਪਲੱਬਧ ਵਰਜਨਾਂ ਨਾਲ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰੋ" ++msgstr "ਸਭ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਨੂੰ ਸਭ ਤੋਂ ਨਵੇਂ ਉਪਲੱਬਧ ਵਰਜਨਾਂ ਨਾਲ ਸਿੰਕਰੋਨਾਈਜ਼ ਕਰੋ" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -94887,7 +96987,7 @@ index e714500..1a5c220 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "" ++msgstr "ਵੇਖਾਓ ਜਾਂ ਵਰਤੋਂ, ਗਰੁੱਪ ਜਾਣਕਾਰੀ" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -95018,122 +97118,122 @@ index e714500..1a5c220 100644 msgstr "ਸੰਰਚਿਤ ਸਾਫਟਵੇਅਰ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵੇਖੋ" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "ਚਾਲੂ" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "ਬੰਦ" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "ਰਿਪੋ-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "ਰਿਪੋ-ਨਾਂ : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "ਰਿਪੋ-ਹਾਲਤ : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "ਰਿਪੋ-ਰੀਵਿਜ਼ਨ: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "ਰਿਪੋ-ਟੈਗ : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "ਰਿਪੋ-ਅੱਪਡੇਟ : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "ਰਿਪੋ-ਪੈਕੇਜ : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "ਰਿਪੋ-ਸਾਈਜ਼ : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "ਰਿਪੋ-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "ਰਿਪੋ-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " ਅੱਪਡੇਟ : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "ਰਿਪੋ-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "ਕਦੇ ਨਹੀਂ (ਆਖਰੀ: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" -msgstr "" +msgstr "ਮੌਕਾ (ਪਿਛਲਾ: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s ਸਕਿੰਟ (ਆਖਰੀ: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "ਰਿਪੋ-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-ਨਾ-ਸ਼ਾਮਲ : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-ਸ਼ਾਮਲ : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " -msgstr "" +msgstr "ਵੱਖ ਰੱਖੀ ਗਈ ਰਿਪੋ: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "ਰਿਪੋ-ਫਾਇਲਨਾਂ:" @@ -95141,219 +97241,226 @@ index e714500..1a5c220 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "repo id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "ਹਾਲਤ" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "ਰਿਪੋ ਨਾਂ" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "%s ਲਈ ਕੋਈ ਮੱਦਦ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1891,7 +1965,7 @@ msgstr "" - "\n" - "ਏਲੀਆਸ: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"ਏਲੀਆਸ: " ++msgstr "\n\nਏਲੀਆਸ: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1901,85 +1975,125 @@ msgstr "" - "\n" - "ਏਲੀਆਸ: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"ਏਲੀਆਸ: " ++msgstr "\n\nਏਲੀਆਸ: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "ਪੈਕੇਜ ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "ਡਾਊਨਗਰੇਡ ਕਾਰਵਾਈ ਲਈ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "ਪੈਕੇਜ ਡਾਊਨਗਰੇਡ ਕਰੋ" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "ਮਸ਼ੀਨ ਤੇ / ਜਾਂ ਉਪਲੱਬਧ ਰਿਪੋ ਲਈ ਵਰਜਨ ਵੇਖੋ।" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " ਯੱਮ ਵਰਜਨ ਗਰੁੱਪ:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " ਗਰੁੱਪ :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " ਪੈਕੇਜ:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "ਇੰਸਟਾਲ ਹੋਏ:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "ਗਰੁੱਪ-ਇੰਸਟਾਲ ਹੋਏ:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "ਉਪਲੱਬਧ:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "ਉਪਲੱਬਧ-ਗਰੁੱਪ:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਅਤੀਤ ਵੇਖੋ ਜਾਂ ਵਰਤੋਂ" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" -+msgstr "" ++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" -+msgstr "" ++msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" -+msgstr "" ++msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" -+msgstr "" ++msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" -+msgstr "" ++msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" -+msgstr "" ++msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" -+msgstr "" ++msgstr " ਯਮ DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "rpmdb ਵਿੱਚ ਸਮੱਸਿਆ ਲਈ ਚੈੱਕ ਕਰੋ" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "" +msgstr "ਸੰਭਾਲੀ ਹੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਨੂੰ ਲੋਡ ਕਰੋ ਫਾਇਲ-ਨਾਂ ਵਿੱਚੋਂ" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "ਕੋਈ ਸੰਭਾਲੀ ਹੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ ਗਈ।" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "%s ਤੋਂ ਟਰਾਂਸੈਕਸ਼ਨ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1988,29 +2102,35 @@ msgstr "" +@@ -1988,106 +2063,108 @@ msgstr "" #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +-msgstr "" +msgstr "ਯਮ ਚੈੱਕ ਫੇਲ੍ਹ ਹੋਇਆ: %s" -+ + +-#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" msgstr "" +-"ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਣ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; ਉਸ ਨੂੰ ਬੰਦ ਹੋਣ ਤੱਕ ਉਡੀਕ ਜਾਰੀ..." --#: ../yummain.py:114 +-#: ../yummain.py:120 +#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" + msgid "Can't create lock file; exiting" +-msgstr "" +msgstr "ਲਾਕ ਫਾਇਲ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕੀ; ਮੌਜੂਦ ਹੈ" + +#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਣ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; ਉਸ ਨੂੰ ਬੰਦ ਹੋਣ ਤੱਕ ਉਡੀਕ ਜਾਰੀ..." ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "ਹਾਲੇ ਕੋਈ ਹੋਰ ਐਪਲੀਕੇਸ਼ਣ ਯੱਮ ਲਾਕ ਵਰਤ ਰਹੀ ਹੈ; ਉਸ ਨੂੰ ਬੰਦ ਹੋਣ ਤੱਕ ਉਡੀਕ ਜਾਰੀ..." --#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -95364,247 +97471,250 @@ index e714500..1a5c220 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" +-msgstr "" +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" - msgstr "" ++msgstr "ਤੁਹਾਡੀ ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਭਾਲੀ ਗਈ, ਇਸ ਨੂੰ ਮੁੜ-ਚਲਾਉ:\nyum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2020,74 +2140,74 @@ msgstr "" - "\n" - "ਯੂਜ਼ਰ ਵੱਲੋਂ ਬੰਦ ਕਰਨ ਉੱਤੇ ਬੰਦ।" + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"ਯੂਜ਼ਰ ਵੱਲੋਂ ਬੰਦ ਕਰਨ ਉੱਤੇ ਬੰਦ।" ++msgstr "\n\nਯੂਜ਼ਰ ਵੱਲੋਂ ਬੰਦ ਕਰਨ ਉੱਤੇ ਬੰਦ।" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" -msgstr "" +msgstr "%s: ਨਿਰਭਰਤਾ ਲਈ pkgSack ਦੀ ਖੋਜ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "ਮੈਂਬਰ: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਬਦਲਿਆ" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s ਚਾਹੀਦਾ ਹੈ: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s ਨੂੰ ਚਾਹੀਦਾ ਹੈ %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "ਸੰਭਾਵਿਤ ਦੇਣ ਵਾਲਾ: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2095,256 +2215,258 @@ msgstr "" +@@ -2095,1013 +2172,1050 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ %s ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "%s ਲਈ ਕੋਈ ਅੱਪਡੇਟ ਮਾਰਗ ਨਹੀਂ ਲੱਭਿਆ। ਫੇਲ੍ਹ!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" -msgstr "" +msgstr "%s: ਲਈ ਨਿਰਭਰਤਾ ਵਾਸਤੇ ਅੱਪਡੇਟ ਮਾਰਗ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਦਾ" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" -+"%s ਉਪਲੱਬਧ ਕਰਵਾਉਣ ਵਾਲਿਆ ਪੈਕੇਜਾਂ ਵਿੱਚ ਹੈ, ਪਰ ਇਹ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਹਟਾਇਆ ਜਾ " -+"ਰਿਹਾ ਹੈ।" +-msgstr "" ++msgstr "%s ਉਪਲੱਬਧ ਕਰਵਾਉਣ ਵਾਲਿਆ ਪੈਕੇਜਾਂ ਵਿੱਚ ਹੈ, ਪਰ ਇਹ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "ਸਫ਼ਲ - ਖਾਲੀ ਟਰਾਂਸੈਕਸ਼ਨ" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "ਚੱਕਰ ਮੁੜ-ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "ਨਿਰਭਰਤਾ ਕਾਰਵਾਈ ਖਤਮ ਹੋ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "ਸਫ਼ਲ - ਨਿਰਭਰਤਾ ਹੱਲ਼ ਹੋਈ" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "%s ਲਈ ਨਿਰਭਰਤਾ ਚੈੱਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s ਨੇ %s ਬਰਤਰਫ਼ ਕੀਤਾ" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -95612,43 +97722,43 @@ index e714500..1a5c220 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "ਆਮ sourcerpm %s ਅਤੇ %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "ਬੇਸ ਪੈਕੇਜ %s %s ਲਈ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "ਘੱਟੋ-ਘੱਟ ਲੋੜ ਹੈ: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " ਜੇਤੂ: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " ਹਾਰਿਆ(%d ਨਾਲ): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "ਵਧੀਆ ਕ੍ਰਮ: %s" @@ -95662,7 +97772,8 @@ index e714500..1a5c220 100644 +#: ../yum/__init__.py:527 #, python-format msgid "Repository %r: Error parsing config: %s" - msgstr "" +-msgstr "" ++msgstr "ਰਿਪੋਜ਼ਟਰੀ %r: ਸੰਰਚਨਾ ਪਾਰਸ ਕਰਨ ਲਈ ਗਲਤੀ: %s" -#: ../yum/__init__.py:488 +#: ../yum/__init__.py:533 @@ -95783,9 +97894,10 @@ index e714500..1a5c220 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2352,21 +2474,21 @@ msgstr "" - "ਅਧੂਰੀਆਂ ਟਰਾਂਸੈਕਸ਼ਨ ਬਾਕੀ ਹਨ। ਤੁਹਾਨੂੰ ਉਹਨਾਂ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ yum-complete-" - "transaction ਚਲਾਉ ਬਾਰੇ ਸੋਚਣਾ ਚਾਹੀਦਾ ਹੈ।" +-msgstr "" +-"ਅਧੂਰੀਆਂ ਟਰਾਂਸੈਕਸ਼ਨ ਬਾਕੀ ਹਨ। ਤੁਹਾਨੂੰ ਉਹਨਾਂ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ yum-complete-" +-"transaction ਚਲਾਉ ਬਾਰੇ ਸੋਚਣਾ ਚਾਹੀਦਾ ਹੈ।" ++msgstr "ਅਧੂਰੀਆਂ ਟਰਾਂਸੈਕਸ਼ਨ ਬਾਕੀ ਹਨ। ਤੁਹਾਨੂੰ ਉਹਨਾਂ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ yum-complete-transaction ਚਲਾਉ ਬਾਰੇ ਸੋਚਣਾ ਚਾਹੀਦਾ ਹੈ।" -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -95809,9 +97921,10 @@ index e714500..1a5c220 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2374,405 +2496,408 @@ msgstr "" - "\n" - "ਪੈਕੇਜ ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਕਰਕੇ ਛੱਡੇ ਗਏ:" +-msgstr "" +-"\n" +-"ਪੈਕੇਜ ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਕਰਕੇ ਛੱਡੇ ਗਏ:" ++msgstr "\nਪੈਕੇਜ ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਕਰਕੇ ਛੱਡੇ ਗਏ:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -95824,9 +97937,10 @@ index e714500..1a5c220 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** %d ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦਾ rpmdb ਸਮੱਸਿਆਵਾਂ ਲੱਭੀਆਂ, 'yum check' ਆਉਟਪੁੱਟ ਅੱਗੇ " - "ਦਿੱਤੀ ਹੈ:" +-msgstr "" +-"** %d ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦਾ rpmdb ਸਮੱਸਿਆਵਾਂ ਲੱਭੀਆਂ, 'yum check' ਆਉਟਪੁੱਟ ਅੱਗੇ " +-"ਦਿੱਤੀ ਹੈ:" ++msgstr "** %d ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦਾ rpmdb ਸਮੱਸਿਆਵਾਂ ਲੱਭੀਆਂ, 'yum check' ਆਉਟਪੁੱਟ ਅੱਗੇ ਦਿੱਤੀ ਹੈ:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -95869,7 +97983,7 @@ index e714500..1a5c220 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s ਇੰਸਟਾਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਪਰ ਇਹ ਨਹੀਂ ਹੈ!" @@ -95880,25 +97994,22 @@ index e714500..1a5c220 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s ਹਟਾਇਆ ਗਿਆ ਹੋਣਾ ਚਾਹੀਦਾ ਸੀ, ਪਰ ਨਹੀਂ ਗਿਆ!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "%s ਲਾਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "%s ਲਾਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" +-#, python-format +-msgid "Unable to check if PID %s is active" -msgstr "" -+msgstr "ਚੈੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਕਿਕੀ PID %s ਐਕਟਿਵ ਹੈ" - +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -95908,13 +98019,25 @@ index e714500..1a5c220 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "%s ਲਈ ਲਾਕ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "%s ਲਾਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s " ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "ਚੈੱਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਕਿਕੀ PID %s ਐਕਟਿਵ ਹੈ" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -95922,23 +98045,23 @@ index e714500..1a5c220 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "checksum ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "ਪੈਕੇਜ ਚੈਕਸਮ ਰਲਦਾ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "%s ਦੀ ਲੋਕਲ ਕਾਪੀ ਦੀ ਵਰਤੋਂ" @@ -95955,162 +98078,163 @@ index e714500..1a5c220 100644 -" * ਚਾਹੀਦੀ %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "ਹੈੱਡਰ ਪੂਰਾ ਨਹੀਂ ਹੈ।" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "ਪੈਕੇਜ %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਸਮੱਸਿਆ" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "%s ਲਈ ਪਬਲਿਕ ਕੁੰਜੀ ਭਰੋਸੇਯੋਗ ਨਹੀਂ" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "ਪੈਕੇਜ %s ਸਾਈਨ ਨਹੀਂ ਕੀਤਾ" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "%s ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s ਹਟਾਇਆ" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "%s ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s ਫਾਇਲ %s ਹਟਾਈ" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਗਈਆਂ" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d %s ਫਾਇਲ ਹਟਾਈ ਗਈ" ++msgstr[1] "%d %s ਫਾਇਲਾਂ ਹਟਾਈਆਂ ਗਈਆਂ" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" - msgstr "" +-msgstr "" ++msgstr "ਅੱਪਡੇਟ ਤੋਂ %s.%s %s:%s-%s ਨਾਲ ਕੁਝ ਵੀ ਮਿਲਦਾ ਨਹੀਂ" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "%d ਪੈਕੇਜਾਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "" -+msgstr[1] "" ++msgstr[0] "%d ਪੈਕੇਜ ਲੱਭਿਆ ਜਾ ਰਿਹਾ ਹੈ" ++msgstr[1] "%d ਪੈਕੇਜ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "ਪੈਕੇਜ %s ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "ਫਾਇਲ ਐਂਟਰੀਆਂ ਲਈ ਖੋਜ ਜਾਰੀ ਹੈ" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "ਪਰੋਵਾਇਡਰ ਐਂਟਰੀਆਂ ਵਿੱਚ ਖੋਜ ਜਾਰੀ" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "ਸੰਰਚਿਤ ਰਿਪੋਜ਼ਟਰੀਆਂ ਵਿੱਚ ਕੋਈ ਗਰੁੱਪ ਡਾਟਾ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "%s ਨਾਂ ਦਾ ਕੋਈ ਗਰੁੱਪ ਮੌਜੂਦ ਨਹੀਂ" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚ ਨਿਸ਼ਾਨਬੱਧ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "ਪੈਕੇਜ %s ਗਰੁੱਪ %s ਵਿੱਚੋਂ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਨਾਂ ਦਾ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "ਸਾਵਧਾਨ: %s ਗਰੁੱਪ ਵਿੱਚ ਕੋਈ ਵੀ ਪੈਕੇਜ ਨਹੀਂ ਹੈ।" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -96119,80 +98243,80 @@ index e714500..1a5c220 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "%s ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ ਦਿੱਤਾ" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" -msgstr "" +msgstr "%s :ਨਾਲ ਮਿਲਦਾ ਕੋਈ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੈ ਤੇ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "ਪੈਕੇਜ: %s - ਪਹਿਲਾਂ ਹੀ ਟਰਾਂਸੈਕਸ਼ਨ ਸੈੱਟ 'ਚ ਹੈ" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "ਪੈਕੇਜ %s ਨੂੰ %s ਵਲੋਂ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ ਹੈ, ਜੋ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -96200,253 +98324,257 @@ index e714500..1a5c220 100644 msgstr "%s ਪੈਕੇਜ %s ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ, ਪਰ ਬਦਲਿਆ ਗਿਆ ਪੈਕੇਜ ਲੋੜ ਪੂਰੀ ਨਹੀਂ ਕਰਦਾ" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "%s ਪੈਕੇਜ %s ਨਾਲ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ, %s ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" +-msgstr "" +-"%s ਪੈਕੇਜ %s ਨਾਲ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ, %s ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" ++msgstr "%s ਪੈਕੇਜ %s ਨਾਲ ਬਰਤਰਫ਼ ਕੀਤਾ ਗਿਆ, %s ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "%s ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ ਅਤੇ ਨਵਾਂ ਵਰਜਨ ਹੈ" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "%s ਨਾਲ ਮਿਲਦਾ ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ। ਅੱਪਡੇਟ ਲਈ ਚੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "ਹਰ ਚੀਜ਼ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "" ++msgstr "%s: ਅਪਗਰੇਡ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਬਰਤਰਫ਼ ਕੀਤਾ: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ, ਜੋ ਬਰਤਰਫ਼ ਹੈ: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" - msgstr "" - "ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਇਹ ਪਹਿਲਾਂ ਹੀ ਅੱਪਡੇਟ ਹੈ: %s.%s %s:%s-%s" +-msgstr "" +-"ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਇਹ ਪਹਿਲਾਂ ਹੀ ਅੱਪਡੇਟ ਹੈ: %s.%s %s:%s-%s" ++msgstr "ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਇਹ ਪਹਿਲਾਂ ਹੀ ਅੱਪਡੇਟ ਹੈ: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "" ++msgstr "%s: ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "ਚੱਲਦਾ ਕਰਨਲ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਤੋਂ %s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ: %s। ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹ।" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "%s ਪੜਤਾਲ ਜਾਰੀ: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "deltarpm localinstall ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: %s। ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ।" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "ਟਰਾਂਸੈਕਸ਼ਨ ਲਈ %s ਪੈਕੇਜ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। %s: ਢਾਂਚੇ ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ" +-msgstr "" +-"ਟਰਾਂਸੈਕਸ਼ਨ ਲਈ %s ਪੈਕੇਜ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। %s: ਢਾਂਚੇ ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ" ++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਲਈ %s ਪੈਕੇਜ ਜੋੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। %s: ਢਾਂਚੇ ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2781,327 +2906,371 @@ msgstr "" - "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ " - "ਕਰਨ ਲਈ yum install ਚਲਾਓ।" + "instead." +-msgstr "" +-"ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ " +-"ਕਰਨ ਲਈ yum install ਚਲਾਓ।" ++msgstr "ਪੈਕੇਜ %s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਇਸ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ yum install ਚਲਾਓ।" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." - msgstr "" -+"ਪੈਕੇਜ %s.%s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਪਹਿਲਾਂ yum " -+"install ਚਲਾਉ।" +-msgstr "" ++msgstr "ਪੈਕੇਜ %s.%s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਪਹਿਲਾਂ yum install ਚਲਾਉ।" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "%s ਅੱਡ ਕੀਤਾ" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "%s ਨੂੰ %s ਦੇ ਲਈ ਅੱਪਡੇਟ ਵਜੋਂ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: ਇੰਸਟਾਲ ਹੋਏ ਪੈਕੇਜ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੇ ਜਾਂਦੇ।" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "%s: ਫਾਇਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ। ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ: ਹਟਾਉਣ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਮਿਲਦਾ" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "ਮੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ: ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਪੈਕੇਜ ਨਾਲ ਕੋਈ ਨਹੀਂ ਮਿਲਦਾ" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "%s ਪੈਕੇਜ ਕਈ ਇੰਸਟਾਲ ਲਈ ਮਨਜ਼ੂਰ ਹੈ, ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਲਈ ਕੋਈ ਮੇਲ ਨਹੀਂ: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "%s: ਪੈਕੇਜ ਲਈ ਕੇਵਲ ਅੱਪਗਰੇਡ ਉਪਲੱਬਧ" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 - #, python-format --msgid "Retrieving key from %s" ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 ++#, python-format +msgid "Failed to upgrade: %s" - msgstr "" ++msgstr "%s: ਅੱਪਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" ++ ++#: ../yum/__init__.py:5059 + #, python-format + msgid "Retrieving key from %s" +-msgstr "" ++msgstr "%s ਤੋਂ ਕੁੰਜੀ ਲਈ ਜਾ ਰਹੀ ਹੈ" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5032 -+#, python-format -+msgid "Retrieving key from %s" -+msgstr "%s ਤੋਂ ਕੁੰਜੀ ਲਈ ਜਾ ਰਹੀ ਹੈ" -+ -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "GPG ਕੁੰਜੀ ਲੈਣ ਲਈ ਫੇਲ੍ਹ: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "%s ਤੋਂ ਗਲਤ GPG ਕੁੰਜੀ: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -96460,7 +98588,7 @@ index e714500..1a5c220 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -96472,31 +98600,31 @@ index e714500..1a5c220 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" -msgstr "" +msgstr "GPG ਕੁੰਜੀ %s (0x%s) ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ (ਕੋਡ %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "ਕੁੰਜੀ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਪੋਰਟ ਕੀਤੀ ਗਈ" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" -msgstr "" +msgstr "ਕੋਈ ਵੀ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੀ" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -96504,31 +98632,31 @@ index e714500..1a5c220 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" -msgstr "" +msgstr "GPG ਕੁੰਜੀ %s (0x%s) ਨੂੰ ਪਹਿਲਾਂ ਹੀ ਇੰਪੋਰਟ ਕੀਤਾ ਗਿਆ ਹੈ" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਫੇਲ੍ਹ" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "%s ਰੈਪੋ ਲਈ ਕੋਈ ਵੀ ਕੁੰਜੀਆਂ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -96536,120 +98664,121 @@ index e714500..1a5c220 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "ਢੁੱਕਵਾਂ ਮਿੱਰਰ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀਆਂ ਆਈਆਂ ਹਨ।" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "%s ਵਿੱਚ ਇਹ ਗਲਤੀ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦਿਉ" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "ਟੈਸਟ ਟਰਾਂਸੈਕਸ਼ਨ ਗਲਤੀਆਂ: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" +-msgstr "" ++msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਨਹੀਂ ਹੋ ਸਕੀ। ਨਾ-ਹੱਲ ਹੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾਵੇਗੀ।" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ %s ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." -msgstr "" +msgstr " ਕੀਤੀ ਮੰਗ ਮੁਤਾਬਕ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." -msgstr "" +msgstr "ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -96755,25 +98884,43 @@ index e714500..1a5c220 100644 msgid "Repackaging" msgstr "ਮੁੜ-ਪੈਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "ਜਾਂਚ: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ %s ਵਿੱਚ ਨਾ-ਲੋੜੀਦੀ ਖਾਲੀ ਥਾਂ\n" -+" * ਖਾਲੀ %s\n" -+" * ਚਾਹੀਦੀ %s" ++msgstr "ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ %s ਵਿੱਚ ਨਾ-ਲੋੜੀਦੀ ਖਾਲੀ ਥਾਂ\n * ਖਾਲੀ %s\n * ਚਾਹੀਦੀ %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3114,8 +3228,7 @@ msgstr "" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"RPM ਡਾਟਾਬੇਸ ਪੜ੍ਹਨ ਲਈ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ। ਸ਼ਾਇਦ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ?" ++msgstr "RPM ਡਾਟਾਬੇਸ ਪੜ੍ਹਨ ਲਈ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ। ਸ਼ਾਇਦ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3131,5 +3244,3 @@ msgstr "ਖਰਾਬ ਹੋਇਆ ਹੈੱਡਰ %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "rpm %s ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ - ਗਲਤੀ %s" +- +- diff --git a/po/pl.po b/po/pl.po -index 0fe83a9..71b2075 100644 +index 0fe83a9..b47b674 100644 --- a/po/pl.po +++ b/po/pl.po -@@ -2,14 +2,15 @@ +@@ -2,952 +2,969 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -96783,22 +98930,24 @@ index 0fe83a9..71b2075 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-11-06 16:04+0000\n" -+"Last-Translator: raven \n" - "Language-Team: Polish (http://www.transifex.net/projects/p/yum/team/pl/)\n" +-"Language-Team: Polish (http://www.transifex.net/projects/p/yum/team/pl/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 21:37+0000\n" ++"Last-Translator: Piotr Drąg \n" ++"Language-Team: Polish (http://www.transifex.net/projects/p/yum/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,123 +18,128 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Aktualizowanie" @@ -96809,31 +98958,31 @@ index 0fe83a9..71b2075 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalowanie" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Przestarzałe" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Zaktualizowano" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Usunięto" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Zainstalowano" @@ -96860,7 +99009,7 @@ index 0fe83a9..71b2075 100644 msgstr "Usunięto: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Usuwanie" @@ -96870,181 +99019,182 @@ index 0fe83a9..71b2075 100644 msgstr "Czyszczenie" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Polecenie \"%s\" zostało już określone" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Ustawianie repozytoriów" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Błąd konfiguracji: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Błąd opcji: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Zainstalowane: %s-%s o %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Zbudowane : %s o %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Wysłane: %s o %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Należy podać polecenie" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Nie ma takiego polecenia: %s. Proszę użyć %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Wymagane miejsce na dysku:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" +-" Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] "" -+" Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" -+msgstr[1] "" -+" Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" -+msgstr[2] "" - " Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" ++msgstr[0] " Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" ++msgstr[1] " Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" ++msgstr[2] " Wymagane jest co najmniej %d MB więcej miejsca w systemie plików %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -141,62 +147,62 @@ msgstr "" - "Podsumowanie błędów\n" - "-------------------\n" +-msgstr "" +-"Podsumowanie błędów\n" +-"-------------------\n" ++msgstr "Podsumowanie błędów\n-------------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie " - "działania." +-msgstr "" +-"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie " +-"działania." ++msgstr "Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie działania." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Kończenie działania na polecenie użytkownika" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Pobieranie pakietów:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Błąd podczas pobierania pakietów:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Wykonywanie sprawdzania transakcji" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "BŁĄD sprawdzania transakcji i rozwiązywania zależności:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "Pakiet RPM musi zostać zaktualizowany" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Proszę zgłosić ten błąd na %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Wykonywanie testu transakcji" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Błąd podczas sprawdzania transakcji:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Test transakcji został ukończony powodzeniem" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Wykonywanie transakcji" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -204,91 +210,116 @@ msgstr "" - "Odmawianie automatycznego zaimportowania kluczy podczas nienadzorowanego uruchomienia.\n" - "Należy użyć \"-y\", aby wymusić." +-msgstr "" +-"Odmawianie automatycznego zaimportowania kluczy podczas nienadzorowanego uruchomienia.\n" +-"Należy użyć \"-y\", aby wymusić." ++msgstr "Odmawianie automatycznego zaimportowania kluczy podczas nienadzorowanego uruchomienia.\nNależy użyć \"-y\", aby wymusić." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Czy chodziło o: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pakiety %s%s%s są dostępne, ale nie są zainstalowane." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Nie ma pakietu %s%s%s." @@ -97052,7 +99202,7 @@ index 0fe83a9..71b2075 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pakiety do zainstalowania" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -97062,13 +99212,13 @@ index 0fe83a9..71b2075 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nie ma niczego do zrobienia" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pakietów oznaczonych do aktualizacji" @@ -97079,12 +99229,12 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów oznaczonych do aktualizacji" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Brak pakietów oznaczonych do aktualizacji" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pakietów oznaczonych do synchronizacji dystrybucji" @@ -97095,12 +99245,12 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów oznaczonych do synchronizacji dystrybucji" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Brak pakietów oznaczonych do synchronizacji dystrybucji" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pakietów oznaczonych do usunięcia" @@ -97111,14 +99261,14 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów oznaczonych do usunięcia" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Brak pakietów oznaczonych do usunięcia" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pakiety do instalacji poprzedniej wersji" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -97127,13 +99277,13 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów do zainstalowania poprzedniej wersji" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (z %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny." @@ -97141,7 +99291,7 @@ index 0fe83a9..71b2075 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pakiety do ponownego zainstalowania" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -97150,159 +99300,163 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów do ponownego zainstalowania" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Nie podano pakietów" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Pakiety do zainstalowania" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "N/S dopasowane: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Pasuje %stylko%s nazwa i podsumowanie, należy użyć \"search all\", aby " - "uzyskać wszystko." +-msgstr "" +-" Pasuje %stylko%s nazwa i podsumowanie, należy użyć \"search all\", aby " +-"uzyskać wszystko." ++msgstr " Pasuje %stylko%s nazwa i podsumowanie, należy użyć \"search all\", aby uzyskać wszystko." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -296,150 +327,156 @@ msgstr "" - " Pasuje %stylko%s pełna nazwa i podsumowanie, należy użyć \"search all\", " - "aby uzyskać wszystko." +-msgstr "" +-" Pasuje %stylko%s pełna nazwa i podsumowanie, należy użyć \"search all\", " +-"aby uzyskać wszystko." ++msgstr " Pasuje %stylko%s pełna nazwa i podsumowanie, należy użyć \"search all\", aby uzyskać wszystko." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Pasujące: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " Pasuje %sgłównie%s nazwa i podsumowanie, należy użyć \"search all\", aby " - "uzyskać wszystko." +-msgstr "" +-" Pasuje %sgłównie%s nazwa i podsumowanie, należy użyć \"search all\", aby " +-"uzyskać wszystko." ++msgstr " Pasuje %sgłównie%s nazwa i podsumowanie, należy użyć \"search all\", aby uzyskać wszystko." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Brak wyników" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nie odnaleziono pakietów dla %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Czyszczenie repozytoriów: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Czyszczenie wszystkiego" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Czyszczenie nagłówków" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Czyszczenie pakietów" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Czytanie metadanych XML" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Czyszczenie bazy danych w pamięci podręcznej" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Czyszczenie metadanych wygasłej pamięci podręcznej" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Czyszczenie bazy danych RPM w pamięci podręcznej" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Czyszczenie wtyczek" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Ostrzeżenie: brak pasujących grup: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Zainstalowane grupy:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Zainstalowane grupy języków:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Dostępne grupy:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Dostępne grupy języków:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Ukończono" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Ostrzeżenie: grupa %s nie istnieje." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 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" +-msgstr "" +-"Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych " +-"grup" ++msgstr "Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych grup" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pakietów do instalacji" @@ -97313,18 +99467,18 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów do zainstalowania" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Grupa o nazwie %s nie istnieje" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Brak pakietów do usunięcia z grup" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pakietów do usunięcia" @@ -97335,556 +99489,565 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d pakietów do usunięcia" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Pakiet %s jest już zainstalowany, pomijanie" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Odrzucanie pakietu %s.%s, którego nie można porównać" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" +-msgstr "" +-"Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" ++msgstr "Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opcje wtyczki" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Błąd wiersza poleceń: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -450,287 +487,291 @@ msgstr "" "\n" - "%s: opcja %s wymaga parametru" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: opcja %s wymaga parametru" ++msgstr "\n\n%s: opcja %s wymaga parametru" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color przyjmuje jedną z: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot musi być ścieżką bezwzględną: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "wyświetla ten komunikat pomocy i kończy pracę" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "toleruje błędy" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" - msgstr "" - "uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej" +-msgstr "" +-"uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej" ++msgstr "uruchamia wyłącznie z pamięci podręcznej systemu i nie aktualizuje jej" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "położenie pliku konfiguracji" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maksymalny czas oczekiwania na polecenie" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "poziom wyjścia debugowania" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "poziom wyjścia błędów" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "poziom wyjścia debugowania dla programu RPM" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "mało komunikatów" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "dużo komunikatów" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "odpowiada tak na wszystkie pytania" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "odpowiada nie na wszystkie pytania" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "wyświetla wersję programu yum i kończy pracę" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "ustawia roota instalacji" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "wyłącza wtyczki programu yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "wyłącza sprawdzanie podpisu GPG" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "wyłącza wtyczki po nazwie" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "włącza wtyczki po nazwie" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "pomija pakiety mające problemy z rozwiązaniem zależności" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontroluje użycie kolorów" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach " - "repozytoriów" +-msgstr "" +-"ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach " +-"repozytoriów" ++msgstr "ustawia wartość zmiennej $releasever w konfiguracji programu yum i plikach repozytoriów" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "ustawia bezwzględne opcje konfiguracji i repozytoriów" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "sty" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "lut" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "kwi" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "maj" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "cze" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "lip" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "sie" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "wrz" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "paź" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "lis" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "gru" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Próbowanie innego serwera lustrzanego." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Nazwa : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Architektura : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epoka : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Wersja : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Wydanie : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Rozmiar : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repozytorium : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Z repozytorium : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Twórca : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Czas wysłania : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Czas zbudowania : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Czas zainstalowania: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Zainstalowane przez: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Zmienione przez : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Podsumowanie : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "Adres URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licencja : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Opis : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "t" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "tak" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "nie" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "W porządku? [t/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -739,154 +780,157 @@ msgstr "" - "\n" - "Grupa: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grupa: %s" ++msgstr "\nGrupa: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Identyfikator grupy: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Opis: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Język: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Pakiety obowiązkowe:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Domyślne pakiety:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Pakiety opcjonalne:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Pakiety warunkowe:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "pakiet: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Brak zależności dla tego pakietu" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " zależność: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Nierozwiązana zależność" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Dopasowano z:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licencja : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Nazwa pliku : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Inne : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Wystąpił błąd podczas obliczania całkowitego rozmiaru pobierania" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Całkowity rozmiar: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Całkowity rozmiar pobierania: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Rozmiar po zainstalowaniu: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Wystąpił błąd podczas obliczania rozmiaru po zainstalowaniu" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Ponowne instalowanie" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Instalowanie poprzedniej wersji" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Instalowanie, aby rozwiązać zależności" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Aktualizowanie, aby rozwiązać zależności" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Usuwanie, aby rozwiązać zależności" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Pominięto (problemy z zależnościami)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Nie zainstalowano" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Niedostępne" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Pakiet" +msgid_plural "Packages" @@ -97893,45 +100056,49 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "Pakiety" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Architektura" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Wersja" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repozytorium" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Rozmiar" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " zastępuje %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -897,57 +941,59 @@ msgstr "" - "Podsumowanie transakcji\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Podsumowanie transakcji\n" +-"%s\n" ++msgstr "\nPodsumowanie transakcji\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalacja %5.5s pakiet(y)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Instalacja" @@ -97939,7 +100106,7 @@ index 0fe83a9..71b2075 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Aktualizacja %5.5s pakiet(y)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Aktualizacja" @@ -97947,7 +100114,7 @@ index 0fe83a9..71b2075 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Usunięcie %5.5s pakiet(y)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Usunięcie" @@ -97955,7 +100122,7 @@ index 0fe83a9..71b2075 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Ponowna instalacja %5.5s pakiet(y)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Ponowna instalacja" @@ -97963,323 +100130,326 @@ index 0fe83a9..71b2075 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Instalacja poprzedniej wersji %5.5s pakiet(y)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Instalacja poprzedniej wersji" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Zależny pakiet" +msgstr[1] "Zależne pakiety" +msgstr[2] "Zależne pakiety" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Usunięto" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Usunięto zależność" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Zainstalowano zależność" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Zaktualizowano zależność" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Zastąpiono" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Nie powiodło się" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "dwóch" -@@ -955,7 +1001,7 @@ msgstr "dwóch" +@@ -955,565 +972,598 @@ msgstr "dwóch" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -965,364 +1011,416 @@ msgstr "" - "\n" - " Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s w ciągu %s%s%s sekund, aby zakończyć pracę.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s w ciągu %s%s%s sekund, aby zakończyć pracę.\n" ++msgstr "\n Obecne pobieranie zostało anulowane, należy %sprzerwać (Ctrl-C) ponownie%s w ciągu %s%s%s sekund, aby zakończyć pracę.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "przerwane przez użytkownika" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Razem" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Pomijanie połączonej transakcji %d do %d, jako że nachodzą na siebie" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Brak transakcji" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Podano błędne identyfikatory transakcji lub pakietów" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Wiersz poleceń" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Zalogowany użytkownik" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "Identyfikator" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Data i czas" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Czynności" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Zmieniono" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Nie podano identyfikatora transakcji" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Podano błędny identyfikator transakcji" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Nie odnaleziono podanego identyfikatora transakcji" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Odnaleziono więcej niż jeden identyfikator transakcji." -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Podano błędny identyfikator transakcji lub pakietu" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Zainstalowano poprzednią wersję" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Starsze" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Nowsze" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Identyfikator transakcji :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Czas rozpoczęcia :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Rozpoczęcie bazy danych RPM:" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u sekund)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minut)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u godzin)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u dni)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Czas ukończenia :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Ukończenie bazy danych RPM :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Użytkownik :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Kod zwrotny :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Przerwano" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Niepowodzenia:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Niepowodzenie:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Powodzenie" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Wiersz poleceń :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Przechowano dodatkowe niedomyślne informacje: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Wykonano transakcję za pomocą:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Zmienione pakiety:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Pominięte pakiety:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problemy bazy danych RPM:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Wyjście skryptu:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Błędy:" @@ -98288,17 +100458,17 @@ index 0fe83a9..71b2075 100644 -msgstr "Instalacja" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Instalacja zależności" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Zastępowanie" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Usunięcie" @@ -98311,296 +100481,312 @@ index 0fe83a9..71b2075 100644 -msgstr "Instalacja poprzedniej wersji" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Aktualizacja" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Czas" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Ostatni dzień" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Ostatni tydzień" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Ostatnie dwa tygodnie" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Ostatnie trzy miesiące" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Ostatnie pół roku" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Ostatni rok" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Ponad rok temu" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Nie odnaleziono transakcji %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Identyfikator transakcji:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Dostępne są dodatkowe informacje o historii:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: nie odnaleziono dodatkowych danych dla tej nazwy" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Pakiet :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "Stan :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Rozmiar :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Komputer budujący :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Czas zbudowania :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Twórca pakietu :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Producent :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Licencja :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "Adres URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "Źródłowy pakiet RPM:" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Czas wysłania :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Wysyłający :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Przyczyna :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Z repozytorium :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Zainstalowane przez:" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Zmienione przez :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "zainstalowany" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "zaktualizowany" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "usunięty" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "ponownie zainstalowany" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "zainstalowana poprzednia wersja" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "zastępowany" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "zaktualizowany" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "zastąpiony" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Wykonywanie sprawdzania transakcji" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Ukończono rozwiązywanie zależności" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Utrzymywanie pakietu: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nierozwiązana zależność: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Pakiet: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1331,7 +1429,7 @@ msgstr "" - "\n" - " Wymaga: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Wymaga: %s" ++msgstr "\n Wymaga: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1340,7 +1438,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1349,7 +1447,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1358,87 +1456,87 @@ msgstr "" - " Nie odnaleziono" +-msgstr "" +-"\n" +-" Nie odnaleziono" ++msgstr "\n Nie odnaleziono" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Zaktualizowano przez" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Zainstalowano poprzednią wersję przez" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Zastąpiono przez" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Dostępne" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." +-msgstr "" +-"--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." ++msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." - msgstr "" - "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." +-msgstr "" +-"---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." ++msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji." ++ ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Sprawdzanie" -#: ../utils.py:99 +#: ../utils.py:129 @@ -98628,7 +100814,7 @@ index 0fe83a9..71b2075 100644 msgstr "Śledzone/zatrzymane" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Nieznane" @@ -98666,36 +100852,47 @@ index 0fe83a9..71b2075 100644 msgid "" "\n" "\n" -@@ -1448,7 +1546,7 @@ msgstr "" - "\n" - "Kończenie działania na polecenie użytkownika" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Kończenie działania na polecenie użytkownika" ++msgstr "\n\nKończenie działania na polecenie użytkownika" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1458,7 +1556,7 @@ msgstr "" - "\n" - "Kończenie działania z powodu przerwanego potoku" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Kończenie działania z powodu przerwanego potoku" ++msgstr "\n\nKończenie działania z powodu przerwanego potoku" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1469,7 +1567,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1477,35 +1575,35 @@ msgstr "" - "Inna aplikacja obecnie blokuje program yum. Kończenie działania zgodnie z " - "konfiguracją exit_on_lock" +-msgstr "" +-"Inna aplikacja obecnie blokuje program yum. Kończenie działania zgodnie z " +-"konfiguracją exit_on_lock" ++msgstr "Inna aplikacja obecnie blokuje program yum. Kończenie działania zgodnie z konfiguracją exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -98736,16 +100933,17 @@ index 0fe83a9..71b2075 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1513,7 +1611,7 @@ msgstr "" - "\n" - "Rozwiązano zależności" +-msgstr "" +-"\n" +-"Rozwiązano zależności" ++msgstr "\nRozwiązano zależności" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Ukończono." -@@ -1525,7 +1623,7 @@ msgstr " Małe użycie:\n" +@@ -1525,7 +1575,7 @@ msgstr " Małe użycie:\n" msgid "You need to be root to perform this command." msgstr "Należy być zalogowanym jako root, aby wykonać to polecenie." @@ -98754,9 +100952,25 @@ index 0fe83a9..71b2075 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1555,53 +1653,53 @@ msgstr "" - "Aby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\n" - "lub pakietu.\n" +@@ -1540,475 +1590,482 @@ msgid "" + "will install it for you.\n" + "\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Włączono sprawdzanie pakietów za pomocą kluczy GPG. To dobry pomysł, brak\n" +-"jednak zainstalowanych żadnych kluczy publicznych GPG. Należy pobrać klucze\n" +-"dla pakietów, które mają zostać zainstalowane i zainstalować je.\n" +-"Można to zrobić wykonując polecenie:\n" +-" rpm --import klucz.publiczny.gpg\n" +-"\n" +-"\n" +-"Można także podać adres URL klucza, który ma być używany dla repozytorium w\n" +-"opcji \"gpgkey\" w sekcji repozytorium, a program yum go zainstaluje.\n" +-"\n" +-"Aby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\n" +-"lub pakietu.\n" ++msgstr "\nWłączono sprawdzanie pakietów za pomocą kluczy GPG. To dobry pomysł, brak\njednak zainstalowanych żadnych kluczy publicznych GPG. Należy pobrać klucze\ndla pakietów, które mają zostać zainstalowane i zainstalować je.\nMożna to zrobić wykonując polecenie:\n rpm --import klucz.publiczny.gpg\n\n\nMożna także podać adres URL klucza, który ma być używany dla repozytorium w\nopcji \"gpgkey\" w sekcji repozytorium, a program yum go zainstaluje.\n\nAby dowiedzieć się więcej, proszę skontaktować się z dostawcą dystrybucji\nlub pakietu.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -98820,9 +101034,12 @@ index 0fe83a9..71b2075 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1611,306 +1709,295 @@ msgstr "" - " Wykonanie polecenia \"yum repolist all\" wyświetli wszystkie posiadane repozytoria.\n" - " Można włączyć repozytoria za pomocą polecenia yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Brak włączonych repozytoriów.\n" +-" Wykonanie polecenia \"yum repolist all\" wyświetli wszystkie posiadane repozytoria.\n" +-" Można włączyć repozytoria za pomocą polecenia yum-config-manager --enable " ++msgstr "Brak włączonych repozytoriów.\n Wykonanie polecenia \"yum repolist all\" wyświetli wszystkie posiadane repozytoria.\n Można włączyć repozytoria za pomocą polecenia yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -99054,120 +101271,120 @@ index 0fe83a9..71b2075 100644 msgstr "Wyświetla skonfigurowane repozytoria oprogramowania" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "włączone" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "wyłączone" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Identyfikator repozytorium : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Nazwa repozytorium : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Stan repozytorium : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Wersja repozytorium : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Znaczniki repozytorium : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Znaczniki dystrybucji repozytorium: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Aktualizacje repozytorium : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Pakiety repozytorium : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Rozmiar repozytorium : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Podstawowy adres URL repozytorium : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Metaodnośnik repozytorium : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Zaktualizowano : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Serwery lustrzane repozytorium : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Nigdy (ostatnio: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Natychmiast (ostatnio: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekundy (ostatnio: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Wygaszenie repozytorium : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Wykluczenia z repozytorium : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Dołączone z repozytorium : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Wykluczenia z repozytorium : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Nazwa pliku repozytorium: " @@ -99175,217 +101392,222 @@ index 0fe83a9..71b2075 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "identyfikator repozytorium" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "stan" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "nazwa repozytorium" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Wyświetla pomocny komunikat o używaniu" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Brak dostępnej pomocy dla %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1920,7 +2007,7 @@ msgstr "" - "\n" - "aliasy: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"aliasy: " ++msgstr "\n\naliasy: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1930,85 +2017,125 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Ustawianie procesu ponownej instalacji" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "Ponownie instaluje pakiet" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Ustawianie procesu instalacji poprzedniej wersji pakietu" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "Instaluje poprzednią wersję pakietu" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Wyświetla wersję dla komputera i/lub dostępnych repozytoriów." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Grupy wersji programu yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Grupa :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Pakiety:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Zainstalowano:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Zainstalowana grupa:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Dostępne:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Dostępne grupy:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Wyświetla lub używa historii transakcji" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Transakcje:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Czas rozpoczęcia:" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Czas ukończenia :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Liczba :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " Baza danych RPM:" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " Baza danych yum:" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Nieprawidłowe podpolecenie historii, należy użyć: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Brak dostępu do bazy danych historii." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" -msgstr "Proszę sprawdzić, czy występują problemy w bazie danych RPM" +msgstr "Sprawdza, czy występują problemy w bazie danych RPM" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "wczytuje zapisaną transakcję z nazwy pliku" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "Nie podano zapisanego pliku transakcji." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "wczytywanie transakcji z %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Wczytano transakcję z %s z %s elementami" -@@ -2019,30 +2146,37 @@ msgstr "Wczytano transakcję z %s z %s elementami" +@@ -2019,108 +2076,106 @@ msgstr "Wczytano transakcję z %s z %s elementami" msgid " Yum checks failed: %s" msgstr " Sprawdzanie programu yum nie powiodło się: %s" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "" +-"Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej " +-"zakończenie..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+"Brak dostępu do odczytu/wykonania w bieżącym katalogu, przenoszenie do /" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "Nie można utworzyć pliku blokady; kończenie działania" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej " - "zakończenie..." ++msgstr "Brak dostępu do odczytu/wykonania w bieżącym katalogu, przenoszenie do /" -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "Nie można utworzyć pliku blokady; kończenie działania" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "Nie można utworzyć pliku blokady; kończenie działania" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Inna aplikacja obecnie blokuje program yum. Oczekiwanie na jej zakończenie..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -99396,295 +101618,303 @@ index 0fe83a9..71b2075 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" -+msgid "" -+"Your transaction was saved, rerun it with:\n" -+" yum load-transaction %s" - msgstr "" +-msgstr "" -"Transakcja została zapisana, można ją ponownie wykonać za pomocą polecenia: " -"yum load-transaction %s" -+"Transakcja została zapisana, można ją wykonać ponownie za pomocą:\n" ++msgid "" ++"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" ++msgstr "Transakcja została zapisana, można ją wykonać ponownie za pomocą:\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2052,75 +2186,75 @@ msgstr "" - "\n" - "Kończenie działania na polecenie użytkownika." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Kończenie działania na polecenie użytkownika." ++msgstr "\n\nKończenie działania na polecenie użytkownika." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach programu yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Ustawianie zestawów transakcji przed włączeniem klasy konfiguracji" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" - msgstr "" - "Nieprawidłowa flaga zestawu transakcji tsflag w pliku konfiguracji: %s" +-msgstr "" +-"Nieprawidłowa flaga zestawu transakcji tsflag w pliku konfiguracji: %s" ++msgstr "Nieprawidłowa flaga zestawu transakcji tsflag w pliku konfiguracji: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Wyszukiwanie zestawu pakietów dla zależności: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Element: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s przekonwertowano do zainstalowania" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Dodawanie pakietu %s w trybie %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Usuwanie pakietu %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s wymaga: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s wymaga %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Wymagana zależność została już odnaleziona, oszukiwanie" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, 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:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Potencjalny dostawca: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Tryb to %s dla dostawcy %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Tryb dla pakietu dostarczającego %s: %s" -@@ -2128,118 +2262,118 @@ msgstr "Tryb dla pakietu dostarczającego %s: %s" +@@ -2128,1049 +2183,1031 @@ msgstr "Tryb dla pakietu dostarczającego %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Próba zaktualizowania %s, aby rozwiązać zależność" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Nie odnaleziono ścieżek aktualizacji dla %s. Niepowodzenie." -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, 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:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, 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ść." +-msgstr "" +-"TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać " +-"zależność." ++msgstr "TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać zależność." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Nie można odnaleźć ścieżki aktualizacji dla zależności dla: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Szybko dopasowano %s jako wymaganie %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, 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." +-msgstr "" +-"%s jest w dostarczających pakietach, ale jest już zainstalowany, usuwanie." ++msgstr "%s jest w dostarczających pakietach, ale jest już zainstalowany, usuwanie." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, 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." +-msgstr "" +-"Pakiet %s potencjalnie rozwiązujący ma nowszą wersję w zestawie transakcji." ++msgstr "Pakiet %s potencjalnie rozwiązujący ma nowszą wersję w zestawie transakcji." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, 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:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s jest już w zestawie transakcji, pomijanie" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Powodzenie - pusta transakcja" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Ponowne uruchamianie pętli" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Kończenie procesu zależności" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Powodzenie - rozwiązano zależności" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Sprawdzanie zależności dla %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "wyszukiwanie %s jako wymagania %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Wykonywanie compare_providers() dla %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "lepsze arch w po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s zastępuje %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2248,144 +2382,144 @@ msgstr "" - "archdist porównało %s do %s na %s\n" - " Zwycięzca: %s" + " Winner: %s" +-msgstr "" +-"archdist porównało %s do %s na %s\n" +-" Zwycięzca: %s" ++msgstr "archdist porównało %s do %s na %s\n Zwycięzca: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "wspólny źródłowy pakiet RPM %s i %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "podstawowy pakiet %s jest zainstalowany dla %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "wspólny przedrostek %s dla %s i %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "wymaga minimum: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Zwycięzca: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Przegrany (za pomocą %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Najlepszy porządek: %s" @@ -99704,8 +101934,9 @@ index 0fe83a9..71b2075 100644 +#: ../yum/__init__.py:533 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora" +-msgstr "" +-"Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora" ++msgstr "Repozytorium %r nie posiada nazwy w konfiguracji, używanie identyfikatora" -#: ../yum/__init__.py:526 +#: ../yum/__init__.py:571 @@ -99800,8 +102031,9 @@ index 0fe83a9..71b2075 100644 +#: ../yum/__init__.py:935 #, python-format msgid "Failed to add Pkg Tags for repository: %s - %s" - msgstr "" - "Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s" +-msgstr "" +-"Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s" ++msgstr "Dodanie znaczników pakietów dla repozytorium nie powiodło się: %s - %s" -#: ../yum/__init__.py:944 +#: ../yum/__init__.py:1015 @@ -99819,9 +102051,10 @@ index 0fe83a9..71b2075 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2393,21 +2527,21 @@ msgstr "" - "Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw " - "polecenia yum-complete-transaction, aby je ukończyć." +-msgstr "" +-"Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw " +-"polecenia yum-complete-transaction, aby je ukończyć." ++msgstr "Pozostały nieukończone transakcje. Można rozważyć wykonanie najpierw polecenia yum-complete-transaction, aby je ukończyć." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -99845,9 +102078,10 @@ index 0fe83a9..71b2075 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2415,90 +2549,93 @@ msgstr "" - "\n" - "Pakiety pominięto z powodu problemów z zależnościami:" +-msgstr "" +-"\n" +-"Pakiety pominięto z powodu problemów z zależnościami:" ++msgstr "\nPakiety pominięto z powodu problemów z zależnościami:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -99860,9 +102094,10 @@ index 0fe83a9..71b2075 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Odnaleziono %d wcześniej istniejących problemów bazy danych RPM. Wynik " - "polecenia \"yum check\":" +-msgstr "" +-"** Odnaleziono %d wcześniej istniejących problemów bazy danych RPM. Wynik " +-"polecenia \"yum check\":" ++msgstr "** Odnaleziono %d wcześniej istniejących problemów bazy danych RPM. Wynik polecenia \"yum check\":" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -99883,9 +102118,10 @@ index 0fe83a9..71b2075 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne " - "błędy." +-msgstr "" +-"Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne " +-"błędy." ++msgstr "Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne błędy." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -99907,7 +102143,7 @@ index 0fe83a9..71b2075 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s miało zostać zainstalowane, ale nie zostało." @@ -99918,24 +102154,22 @@ index 0fe83a9..71b2075 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s miało zostać usunięte, ale nie zostało." -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Nie można otworzyć blokady %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Nie można otworzyć blokady %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Nie można sprawdzić, czy PID %s jest aktywny" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Nie można sprawdzić, czy PID %s jest aktywny" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -99945,40 +102179,55 @@ index 0fe83a9..71b2075 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Nie można utworzyć blokady na %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Nie można otworzyć blokady %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Nie można sprawdzić, czy PID %s jest aktywny" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2507,42 +2644,31 @@ msgstr "" - "Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać " - "polecenie yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać " +-"polecenie yum --enablerepo=%s clean metadata" ++msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem. Sugestia: proszę wykonać polecenie yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Nie można wykonać sprawdzenia sum kontrolnych" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Sumy kontrolne pakietu nie zgadzają się" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, 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" +-msgstr "" +-"sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w " +-"pamięci podręcznej dla %s jest włączone" ++msgstr "sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w pamięci podręcznej dla %s jest włączone" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "używanie lokalnej kopii %s" @@ -99995,69 +102244,70 @@ index 0fe83a9..71b2075 100644 -" * wymagane %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Nagłówek nie jest pełny." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2550,62 +2676,65 @@ 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" +-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" ++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:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Klucz publiczny dla %s nie jest zainstalowany" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Wystąpił problem podczas otwierania pakietu %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Klucz publiczny dla %s nie jest zaufany" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Pakiet %s nie jest podpisany" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Nie można usunąć %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "Usunięto %s" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Nie można usunąć %s pliku %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "Usunięto %s plik %s" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "Usunięto %d %s plików" @@ -100068,28 +102318,29 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "%d %s plików zostało usuniętych" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, 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:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, 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:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2613,56 +2742,59 @@ msgstr "" - "searchPackages() zostanie usunięte w przyszłych wersjach programu yum." - " Zamiast tego należy użyć searchGenerator(). \n" +-msgstr "" +-"searchPackages() zostanie usunięte w przyszłych wersjach programu yum." +-" Zamiast tego należy użyć searchGenerator(). \n" ++msgstr "searchPackages() zostanie usunięte w przyszłych wersjach programu yum. Zamiast tego należy użyć searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Wyszukiwanie %d pakietów" @@ -100100,209 +102351,214 @@ index 0fe83a9..71b2075 100644 +msgstr[2] "Wyszukiwanie %d pakietów" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "wyszukiwanie pakietu %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "wyszukiwanie we wpisach plików" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "wyszukiwanie we wpisach dostarczania" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Grupa o nazwie %s nie istnieje" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "pakiet %s nie został oznaczony w grupie %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Dodawanie pakietu %s z grupy %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Ostrzeżenie: grupa %s nie posiada żadnych pakietów." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." - msgstr "" -@@ -2670,65 +2802,66 @@ msgstr "" +-msgstr "" +-"Grupa %s posiada %u pakiety warunkowe, które mogą zostać zainstalowane." ++msgstr "Grupa %s posiada %u pakiety warunkowe, które mogą zostać zainstalowane." #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Nie można odnaleźć krotki pakietu %s w zestawie pakietów" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Nie można odnaleźć krotki pakietu %s w bazie danych RPM" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Nieprawidłowa flaga wersji z: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Nie odnaleziono pakietu %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Obiekt pakietu nie był instancją obiektu pakietu" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Nie podano nic do zainstalowania" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, 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:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Brak wyników dla parametru: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Brak pakietów dostępnych do instalacji" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pakiet: %s - jest już w zestawie transakcji" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2737,97 +2870,103 @@ msgstr "" - "Pakiet %s został zastąpiony przez %s, ale zastępujący pakiet nie spełnia " - "wymagań" + "requirements" +-msgstr "" +-"Pakiet %s został zastąpiony przez %s, ale zastępujący pakiet nie spełnia " +-"wymagań" ++msgstr "Pakiet %s został zastąpiony przez %s, ale zastępujący pakiet nie spełnia wymagań" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" +-msgstr "" +-"Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" ++msgstr "Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." +-msgstr "" +-"Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." ++msgstr "Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Aktualizowanie wszystkiego" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Brak pakietów pasujących do aktualizacji: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, 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:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s" @@ -100310,409 +102566,417 @@ index 0fe83a9..71b2075 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Brak pasujących pakietów do usunięcia" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Brak pakietów pasujących do usunięcia: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Pomijanie uruchomionego jądra: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Usuwanie %s z transakcji" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Nie można otworzyć: %s. Pomijanie." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Sprawdzanie %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Nie można lokalnie zainstalować pakietu RPM delta: %s. Pomijanie." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "Nie można dodać pakietu %s do transakcji. Niezgodna architektura: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Nie można zainstalować pakietu %s. Został zastąpiony zainstalowanym pakietem" - " %s" +-msgstr "" +-"Nie można zainstalować pakietu %s. Został zastąpiony zainstalowanym pakietem" +-" %s" ++msgstr "Nie można zainstalować pakietu %s. Został zastąpiony zainstalowanym pakietem %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2836,7 +2975,7 @@ msgstr "" - "Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać" - " polecenie yum install, aby go zainstalować." + "instead." +-msgstr "" +-"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać" +-" polecenie yum install, aby go zainstalować." ++msgstr "Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Proszę wykonać polecenie yum install, aby go zainstalować." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2845,142 +2984,151 @@ msgstr "" - "Pakiet %s.%s nie jest zainstalowany, więc nie może zostać zaktualizowany. " - "Należy wykonać polecenie yum install, aby go zainstalować." + " instead." +-msgstr "" +-"Pakiet %s.%s nie jest zainstalowany, więc nie może zostać zaktualizowany. " +-"Należy wykonać polecenie yum install, aby go zainstalować." ++msgstr "Pakiet %s.%s nie jest zainstalowany, więc nie może zostać zaktualizowany. Należy wykonać polecenie yum install, aby go zainstalować." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Wykluczanie %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Oznaczanie %s do zainstalowania" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Oznaczanie %s jako aktualizacji %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: nie aktualizuj zainstalowanego pakietu." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Nie można otworzyć pliku: %s. Pomijanie." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do" - " usunięcia" +-msgstr "" +-"Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do" +-" usunięcia" ++msgstr "Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do usunięcia" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego " - "do zainstalowania" +-msgstr "" +-"Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego " +-"do zainstalowania" ++msgstr "Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego do zainstalowania" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Brak pakietów dostępnych do instalacji poprzedniej wersji" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Brak wyników dla dostępnych pakietów: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Zainstalowanie poprzedniej wersji nie powiodło się: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Aktualizacja się nie powiodła: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Pobieranie klucza z %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Pobranie klucza GPG nie powiodło się: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "Podpis GPG klucza %s nie pasuje do klucza CA dla repozytorium: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "Podpis GPG klucza został sprawdzony za pomocą kluczy CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Nieprawidłowy klucz GPG z %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" - msgstr "" - "Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s" +-msgstr "" +-"Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s" ++msgstr "Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" +-msgstr "" +-"Importowanie %s klucza 0x%s:\n" +-" Identyfikator użytkownika: %s\n" +-" Pakiet : %s (%s)\n" +-" Od : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" Package : %s (%s)\n" +" From : %s" - msgstr "" - "Importowanie %s klucza 0x%s:\n" --" Identyfikator użytkownika: %s\n" -+" Identyfikator użytkownika: \"%s\"\n" -+" Odcisk palca : %s\n" - " Pakiet : %s (%s)\n" --" Od : %s" -+" Z : %s" ++msgstr "Importowanie %s klucza 0x%s:\n Identyfikator użytkownika: \"%s\"\n Odcisk palca : %s\n Pakiet : %s (%s)\n Z : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" +-msgstr "" +-"Importowanie %s klucza 0x%s:\n" +-" Identyfikator użytkownika: \"%s\"\n" +-" Od : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" - msgstr "" - "Importowanie %s klucza 0x%s:\n" - " Identyfikator użytkownika: \"%s\"\n" --" Od : %s" -+" Odcisk palca : %s\n" -+" Z : %s" ++msgstr "Importowanie %s klucza 0x%s:\n Identyfikator użytkownika: \"%s\"\n Odcisk palca : %s\n Z : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Klucz GPG %s (0x%s) jest już zainstalowany" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Zaimportowanie klucza nie powiodło się (kod %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Klucz został pomyślnie zaimportowany" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Nie zainstalowano żadnych kluczy" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2989,25 +3137,25 @@ msgstr "" - "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne dla tego pakietu.\n" - "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne dla tego pakietu.\n" +-"Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." ++msgstr "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne dla tego pakietu.\nProszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Klucz GPG %s (0x%s) został już zaimportowany" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Zaimportowanie klucza nie powiodło się" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Nie zainstalowano żadnych kluczy dla repozytorium %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3016,161 +3164,187 @@ msgstr "" - "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne.\n" - "Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne.\n" +-"Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." ++msgstr "Klucze GPG wyświetlone dla repozytorium \"%s\" są już zainstalowane, ale nie są poprawne.\nProszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne adresy URL do kluczy." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Wystąpiły błędy podczas pobierania pakietów." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Proszę zgłosić ten błąd na %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Błędy testu transakcji: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Nie można ustawić katalogu pamięci podręcznej: %s " -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" - "Zależności nie zostały rozwiązane. Nierozwiązana transakcja nie zostanie " - "zapisana." +-msgstr "" +-"Zależności nie zostały rozwiązane. Nierozwiązana transakcja nie zostanie " +-"zapisana." ++msgstr "Zależności nie zostały rozwiązane. Nierozwiązana transakcja nie zostanie zapisana." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Nie można zapisać pliku transakcji %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Nie można uzyskać dostępu/odczytać zapisanej transakcji %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "wersja bazy danych RPM nie zgadza się z wersją zapisanej transakcji, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " ignorowanie, jak zażądano." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " przerywanie." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "nie można odnaleźć tsflags lub nie jest liczbą całkowitą." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Odnaleziono txmbr w nieznanym obecnym stanie: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Nie można odnaleźć txmbr: %s w stanie %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Nie można odnaleźć txmbr: %s z pierwotnego: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Brak elementów transakcji, związków lub ts zostało zmodyfikowane," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " ignorowanie, jak zażądano. Należy rozwiązać zależności." +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s zostało już odwiedzone i nie może zostać usunięte." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Sprawdzanie odwrotnych zależności pakietu %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." -+msgstr "" -+"Pakiet %s posiada odwrotną zależność %s zainstalowaną przez użytkownika." ++msgstr "Pakiet %s posiada odwrotną zależność %s zainstalowaną przez użytkownika." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "" -+"%s nie posiada odwrotnych zależności zainstalowanych przez użytkownika." ++msgstr "%s nie posiada odwrotnych zależności zainstalowanych przez użytkownika." + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -100761,9 +103025,10 @@ index 0fe83a9..71b2075 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania " - "wtyczek" +-msgstr "" +-"Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania " +-"wtyczek" ++msgstr "Istnieją dwie lub więcej wtyczek o nazwie \"%s\" w ścieżce wyszukiwania wtyczek" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -100811,26 +103076,44 @@ index 0fe83a9..71b2075 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s dostarcza %s, ale nie można go odnaleźć" -@@ -3179,6 +3353,17 @@ msgstr "%s dostarcza %s, ale nie można go odnaleźć" +@@ -3179,6 +3216,19 @@ msgstr "%s dostarcza %s, ale nie można go odnaleźć" msgid "Repackaging" msgstr "Ponowne tworzenie pakietu" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Sprawdzanie: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Niewystarczająca ilość miejsca w katalogu pobierania %s\n" -+" * wolne %s\n" -+" * wymagane %s" ++msgstr "Niewystarczająca ilość miejsca w katalogu pobierania %s\n * wolne %s\n * wymagane %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3191,8 +3241,7 @@ msgstr "Sprawdzenie MD5 pakietu RPM %s nie powiodło się" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Nie można otworzyć bazy danych RPM do odczytania. Może jest już używana?" ++msgstr "Nie można otworzyć bazy danych RPM do odczytania. Może jest już używana?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3208,5 +3257,3 @@ msgstr "Uszkodzony nagłówek %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Błąd podczas otwierania pakietu RPM %s - błąd %s" +- +- diff --git a/po/pt.po b/po/pt.po -index 9e76ec0..d846dda 100644 +index 9e76ec0..b8d5e29 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,13 +2,14 @@ @@ -100841,12 +103124,13 @@ index 9e76ec0..d846dda 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -100856,7 +103140,7 @@ index 9e76ec0..d846dda 100644 "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -100867,31 +103151,31 @@ index 9e76ec0..d846dda 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -100918,7 +103202,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -100928,69 +103212,69 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Erro nas Opções: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -101001,98 +103285,98 @@ index 9e76ec0..d846dda 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -101100,7 +103384,7 @@ index 9e76ec0..d846dda 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -101109,13 +103393,13 @@ index 9e76ec0..d846dda 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -101125,12 +103409,12 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -101140,12 +103424,12 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -101155,14 +103439,14 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -101170,13 +103454,13 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -101184,7 +103468,7 @@ index 9e76ec0..d846dda 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -101192,151 +103476,151 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -101346,18 +103630,18 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -101367,37 +103651,37 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -101406,353 +103690,353 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -101760,157 +104044,157 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -101918,33 +104202,33 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arq." -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versão" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -101955,77 +104239,77 @@ index 9e76ec0..d846dda 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -102034,271 +104318,271 @@ index 9e76ec0..d846dda 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +968,536 @@ msgid "" +@@ -935,484 +968,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -102307,17 +104591,17 @@ index 9e76ec0..d846dda 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -102330,224 +104614,224 @@ index 9e76ec0..d846dda 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -102555,7 +104839,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -102563,7 +104847,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -102571,7 +104855,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -102579,43 +104863,49 @@ index 9e76ec0..d846dda 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -102641,7 +104931,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -102695,7 +104985,7 @@ index 9e76ec0..d846dda 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1505,47 @@ msgid "" +@@ -1420,47 +1511,47 @@ msgid "" "%s" msgstr "" @@ -102752,7 +105042,7 @@ index 9e76ec0..d846dda 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1557,7 @@ msgstr "" +@@ -1472,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -102761,7 +105051,7 @@ index 9e76ec0..d846dda 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1574,480 @@ msgid "" +@@ -1489,451 +1580,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -103058,153 +105348,153 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -103212,7 +105502,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -103220,148 +105510,148 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2058,106 @@ msgstr "" +@@ -1944,100 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -103406,226 +105696,226 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2165,1028 @@ msgstr "" +@@ -2045,991 +2171,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -103633,43 +105923,43 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -103882,7 +106172,7 @@ index 9e76ec0..d846dda 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -103893,40 +106183,48 @@ index 9e76ec0..d846dda 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Não é possível verificar se o PID %s está activo" +-msgid "Unable to check if PID %s is active" +-msgstr "Não é possível verificar se o PID %s está activo" ++msgid "Could not create lock at %s: %s " ++msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " - msgstr "" +-msgid "Could not create lock at %s: %s " +-msgstr "" ++msgid "Unable to check if PID %s is active" ++msgstr "Não é possível verificar se o PID %s está activo" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -103934,23 +106232,23 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -103964,67 +106262,67 @@ index 9e76ec0..d846dda 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -104034,26 +106332,26 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -104063,62 +106361,62 @@ index 9e76ec0..d846dda 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -104126,79 +106424,79 @@ index 9e76ec0..d846dda 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -104206,118 +106504,118 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -104325,7 +106623,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -104333,118 +106631,118 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -104458,7 +106756,7 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -104470,29 +106768,29 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -104500,29 +106798,29 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -104530,117 +106828,117 @@ index 9e76ec0..d846dda 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -104740,10 +107038,15 @@ index 9e76ec0..d846dda 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3195,14 @@ msgstr "" +@@ -3038,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -104755,11 +107058,17 @@ index 9e76ec0..d846dda 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3243,3 @@ msgstr "Cabeçalho %s Danificado" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Erro ao abrir o RPM %s - erro %s" +- +- diff --git a/po/pt_BR.po b/po/pt_BR.po -index 493f090..c921d06 100644 +index 493f090..5eb3583 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -2,14 +2,16 @@ +@@ -2,943 +2,959 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -104770,22 +107079,24 @@ index 493f090..c921d06 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/yum/team/pt_BR/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/yum/team/pt_BR/)\n" ++"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/yum/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +19,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Atualizando" @@ -104796,31 +107107,31 @@ index 493f090..c921d06 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instalando" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Obsoletos" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Atualizados" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Removidos" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Instalados" @@ -104847,7 +107158,7 @@ index 493f090..c921d06 100644 msgstr "Removidos: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Removendo" @@ -104857,176 +107168,178 @@ index 493f090..c921d06 100644 msgstr "Limpeza" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Comando \"%s\" já definido" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Configurando repositórios" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Lendo metadados do repositório a partir dos arquivos locais" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Erro de configuração: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Erro nas opções: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instalados: %s-%s em %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Construídos : %s em %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Enviados: %s em %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Você precisa dar algum comando" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Comando não encontrado: %s. Por favor, utilize %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Requisitos de disco:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Pelo menos mais %dMB são necessários no sistema de arquivos %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] " Pelo menos mais %dMB são necessários no sistema de arquivos %s.\n" ++msgstr[0] "" +msgstr[1] " Pelo menos mais %dMB são necessários no sistema de arquivos %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,60 +144,60 @@ msgstr "" - "Sumário de erros\n" - "-------------\n" +-msgstr "" +-"Sumário de erros\n" +-"-------------\n" ++msgstr "Sumário de erros\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Tentando executar a transação, mas não há nada a ser feito. Saindo." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Saindo pelo comando do usuário" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Baixando pacotes:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Erro ao baixar pacotes:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" -msgstr "" +msgstr "Executando Verificação da Transação" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ERRO. Você precisa atualizar o rpm para manipular:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "O RPM precisa ser atualizado" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Por favor, relate esse erro em %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Executando teste de transação" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Erro na verificação da transação:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Teste de transação completo" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Executando a transação" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -201,236 +205,261 @@ msgstr "" - "Recusa de importação automática das chaves ao executar de forma não assistida.\n" - "Use \"-y\" para sobrescrever." +-msgstr "" +-"Recusa de importação automática das chaves ao executar de forma não assistida.\n" +-"Use \"-y\" para sobrescrever." ++msgstr "Recusa de importação automática das chaves ao executar de forma não assistida.\nUse \"-y\" para sobrescrever." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Talvez você queira dizer: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Pacotes %s%s%s disponíveis, mas já instalados." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Nenhum pacote %s%s%s disponível." @@ -105034,7 +107347,7 @@ index 493f090..c921d06 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Pacotes a serem instalados" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -105043,13 +107356,13 @@ index 493f090..c921d06 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nada a ser feito" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d pacotes marcados para atualização" @@ -105059,12 +107372,12 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Nenhum pacote marcado para atualização" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d pacotes marcados para Sincronização da Distribuição" @@ -105074,12 +107387,12 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Nenhum pacote marcado para a Sincronização da Distribuição" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d pacotes marcados para remoção" @@ -105089,14 +107402,14 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Nenhum pacote marcado para remoção" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Pacote(s) a ser(em) desatualizados(s)" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -105104,13 +107417,13 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (a partir de %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "O pacote instalado %s%s%s%s não está disponível." @@ -105118,7 +107431,7 @@ index 493f090..c921d06 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Pacote(s) a ser(em) reinstalado(s)" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -105126,160 +107439,160 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Nenhum pacote fornecido" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Pacotes a serem instalados" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." -msgstr "" +msgstr " Nome e sumário correspondem %sonly%s, use \"search all\" para tudo." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" -+" Nome completo e sumário correspondem %sonly%s, use \"search all\" para " -+"tudo." +-msgstr "" ++msgstr " Nome completo e sumário correspondem %sonly%s, use \"search all\" para tudo." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Encontrado: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." -msgstr "" +msgstr " Nome e sumário correspondem %smostly%s, use \"search all\" para tudo." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Aviso: nenhum resultado para: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Nenhum pacote localizado" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nenhum pacote localizado para %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Limpando repositórios:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Limpando tudo" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Limpando cabeçalhos" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Limpando pacotes" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Limpando metadados em xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Limpando cache do banco de dados" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Limpando metadados expirados do cache" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Limpando dados rpmdb em cache" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Limpando plugins" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "Aviso: Nenhum grupo correspondente: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Grupos instalados:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" -msgstr "" +msgstr "Grupos de Idiomas Instalados:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Grupos disponíveis:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" -msgstr "" +msgstr "Grupos de Idiomas Disponíveis:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Concluído" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Aviso: O grupo %s não existe." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 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" ++msgstr "Nenhum pacote disponível para instalação ou atualização nos grupos requisitados" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d pacote(s) a ser(em) instalado(s)" @@ -105289,18 +107602,18 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Nenhum grupo de nome %s existe" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Nenhum pacote a ser removido a partir dos grupos" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d pacote(s) a ser(em) removido(s)" @@ -105310,604 +107623,617 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "O pacote %s já está instalado, ignorando" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, 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:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, 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" ++msgstr "Nenhum outro %s instalado, adicionado à lista para potencial instalação" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opções do plugin" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Erro na linha de comando: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -441,287 +470,291 @@ msgstr "" "\n" - "%s: a opção %s requer um argumento" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: a opção %s requer um argumento" ++msgstr "\n\n%s: a opção %s requer um argumento" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color aceita uma destas opções: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "--installroot deve ser um caminho absoluto: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "mostrar essa mensagem ajuda e sai" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "ser tolerante com os erros" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" - msgstr "" - "executar por completo a partir do cache do sistema, não atualiza o cache" +-msgstr "" +-"executar por completo a partir do cache do sistema, não atualiza o cache" ++msgstr "executar por completo a partir do cache do sistema, não atualiza o cache" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "configurar localização do arquivo" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "Tempo máximo de espera do comando" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "nível de depuração na saída" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "mostrar duplicados em repos e em comandos de pesquisa/listagem" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "nível de erro na saída" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "nível de depuração na saída para o rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "operação discreta" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "operação detalhada" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "responder sim para todas as perguntas" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "mostrar versão do Yum ao sair" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "definir raiz de instalação" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "habilitar um ou mais repositórios (curingas são permitidos)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "desabilitar um ou mais repositórios (curingas são permitidos)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "excluir pacote(s) por nome ou glob" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 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" ++msgstr "desabilitar a exclusão a partir do principal, para um repositório ou para tudo" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "Habilitar processo de obsolescência durante as atualizações" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "desabilitar plugins do Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "desabilitar verificação de assinaturas gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "desabilitar plugins pelo nome" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "habilita plugins pelo nome" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "ignorar pacotes com problemas de solução de dependências" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "controla o uso da cor" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "defina o valor de $releasever nos arquivos repo e yum config" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "Configurando opções arbitrárias de repositório e configurações. " -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Fev" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Abr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Mai" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Ago" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Set" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Out" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Dez" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Tentando outro espelho." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Nome : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arquitetura : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Época : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Versão : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Lançamento : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Tamanho : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Repo : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Do repositório : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Executor : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Tempo de execução : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Tempo de compilação : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Tempo de instalação: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Instalado por %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Alterado por : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Sumário : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licença : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Descrição : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "s" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "sim" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "não" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Correto? [s/N]:" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -730,154 +763,156 @@ msgstr "" - "\n" - "Grupo: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grupo: %s" ++msgstr "\nGrupo: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Group-Id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Descrição: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr " Linguagem: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Pacotes obrigatórios:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Pacotes padrão:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Pacotes opcionais:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Pacotes condicionais:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "pacote: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Nenhuma dependência para este pacote" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " dependência: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Dependência não satisfeita" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Resultado a partir de:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licença : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Nome de arquivo : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Outro : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Houve um erro no cálculo do tamanho total do download" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Tamanho total: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Tamanho total do download: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Tamanho depois de instalado: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Houve um erro ao calcular o tamanho instalado" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Reinstalando" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Desatualizando" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Instalando para as dependências" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Atualizando para as dependências" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Removendo para as dependências" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Ignorado (problemas de dependências)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Não instalado" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Não disponível" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Pacote" +msgid_plural "Packages" -+msgstr[0] "Pacote" -+msgstr[1] "" ++msgstr[0] "" ++msgstr[1] "Pacote" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arq." -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Versão" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Repo" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Tam." -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " substituindo %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -888,57 +923,58 @@ msgstr "" - "Resumo da transação\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Resumo da transação\n" +-"%s\n" ++msgstr "\nResumo da transação\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Instalar %5.5s Pacote(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Instalar" @@ -105915,7 +108241,7 @@ index 493f090..c921d06 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Atualizar %5.5s Pacote(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -105923,7 +108249,7 @@ index 493f090..c921d06 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Remover %5.5s Pacote(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -105931,7 +108257,7 @@ index 493f090..c921d06 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Reinstalar %5.5s Pacote(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Reinstalar" @@ -105939,329 +108265,333 @@ index 493f090..c921d06 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Desatualizar %5.5s Pacote(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Desatualizar" - --#: ../output.py:1165 -+#: ../output.py:1464 ++ ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" -+ -+#: ../output.py:1524 + +-#: ../output.py:1165 ++#: ../output.py:1531 msgid "Removed" msgstr "Removido(s)" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Dependência(s) removida(s)" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Dependência(s) instalada(s)" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Dependência(s) atualizada(s)" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Substituído(s)" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Falhou" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "dois" -@@ -946,7 +982,7 @@ msgstr "dois" +@@ -946,567 +962,598 @@ msgstr "dois" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -957,364 +993,416 @@ msgstr "" - " Download atual cancelado, %sinterrompa com (ctrl-c) novamente%s dentro de %s%s%s segundos\n" - "para sair.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Download atual cancelado, %sinterrompa com (ctrl-c) novamente%s dentro de %s%s%s segundos\n" +-"para sair.\n" ++msgstr "\n Download atual cancelado, %sinterrompa com (ctrl-c) novamente%s dentro de %s%s%s segundos\npara sair.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "interrupção do usuário" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Total" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Sistema" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "" +msgstr "Nenhuma transação" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "IDs de transação ou pacote(s) fornecido(s) inválido(s)" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "Linha de comando" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Usuário de login" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Data e hora" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Ação(ões)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Alterado" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Nenhum ID de transação fornecido" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "O ID de transação fornecido é inválido" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "O ID de transação dado não foi localizado" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Foi localizado mais de um ID de transação!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Nenhum ID de transação ou pacote fornecido" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Desatualizados" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Antigo" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Recente" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "ID de transação:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Horário de início:" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Início do rpmdb:" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u segundos)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u minutos)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u horas)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u dias)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Horário do fim:" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Fim do rpmdb:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Usuário:" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Código de retorno:" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Interrompido" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" -msgstr "" +msgstr "Falhas:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Falha:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Sucesso" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Linha de comando :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "informações não-padrão adicionais armazenadas: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transação realizada com:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Pacotes alterados:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Pacotes ignorados: " -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Problemas com Rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Saída do scriptlet:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Erros:" @@ -106270,17 +108600,17 @@ index 493f090..c921d06 100644 -msgstr "Instalar" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Dep-Install" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Obsoletos" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Apagar" @@ -106293,302 +108623,317 @@ index 493f090..c921d06 100644 -msgstr "Desatualizar" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Atualizar" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Hora" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Ontem" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Uma semana atrás" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "2 semanas atrás" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "3 meses atrás" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "6 meses atrás" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Ano passado" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Há mais de um ano" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Nenhuma transação %s achada" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "ID da transação:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Informação adicional do histórico disponível:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Não há dados adicionais encontrados por este nome" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "instalado" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" -msgstr "" +msgstr "uma atualização" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "removido" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "Reinstalado" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" -msgstr "" +msgstr "um downgrade" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" -msgstr "" +msgstr "obsoleto" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "atualizado" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "obsoleto" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> O pacote %s.%s %s:%s-%s será %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Executando verificação da transação" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Reiniciando resolução de dependências com as novas alterações." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Resolução de dependências finalizada" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Processando dependência: %s para o pacote: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Manter os pacotes: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Dependência não resolvida: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Pacote: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1323,7 +1411,7 @@ msgstr "" - "\n" - " Requer: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Requer: %s" ++msgstr "\n Requer: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1332,7 +1420,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1341,7 +1429,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1350,87 +1438,87 @@ msgstr "" - " Não encontrado" +-msgstr "" +-"\n" +-" Não encontrado" ++msgstr "\n Não encontrado" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Atualizado por" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Desatualizado por" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Obsoletado por" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Disponível" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Processando conflito: %s conflita com %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 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." ++msgstr "--> Construindo conjunto de transações com os pacotes selecionados. Por favor aguarde." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "--> Baixando cabeçalho do %s para inclusão no conjunto de transações." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Executando" @@ -106614,7 +108959,7 @@ index 493f090..c921d06 100644 msgstr "Rastreado/Parado" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Desconhecido" @@ -106652,36 +108997,47 @@ index 493f090..c921d06 100644 msgid "" "\n" "\n" -@@ -1440,7 +1528,7 @@ msgstr "" - "\n" - "Saindo pelo cancelamento do usuário" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Saindo pelo cancelamento do usuário" ++msgstr "\n\nSaindo pelo cancelamento do usuário" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1450,7 +1538,7 @@ msgstr "" - "\n" - "Saindo por um pipe defeituoso" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Saindo por um pipe defeituoso" ++msgstr "\n\nSaindo por um pipe defeituoso" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1461,7 +1549,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1469,36 +1557,36 @@ msgstr "" - "No momento outro aplicativo está com a posse da trava do yum; saindo " - "conforme configurado pelo exit_on_lock" +-msgstr "" +-"No momento outro aplicativo está com a posse da trava do yum; saindo " +-"conforme configurado pelo exit_on_lock" ++msgstr "No momento outro aplicativo está com a posse da trava do yum; saindo conforme configurado pelo exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -106704,8 +109060,9 @@ index 493f090..c921d06 100644 -#: ../utils.py:346 ../yummain.py:194 +#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" - msgstr "" - " Você pode tentar usar o parâmetro --skip-broken para contornar o problema" +-msgstr "" +-" Você pode tentar usar o parâmetro --skip-broken para contornar o problema" ++msgstr " Você pode tentar usar o parâmetro --skip-broken para contornar o problema" -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 @@ -106723,16 +109080,17 @@ index 493f090..c921d06 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1506,7 +1594,7 @@ msgstr "" - "\n" - "Dependências resolvidas" +-msgstr "" +-"\n" +-"Dependências resolvidas" ++msgstr "\nDependências resolvidas" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Concluído!" -@@ -1518,7 +1606,7 @@ msgstr "" +@@ -1518,7 +1565,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Você precisa ser root para executar este comando." @@ -106741,9 +109099,25 @@ index 493f090..c921d06 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1548,53 +1636,53 @@ msgstr "" +@@ -1533,585 +1580,592 @@ msgid "" + "will install it for you.\n" "\n" - "Para mais informações contate o fornecedor da sua distribuição ou do pacote.\n" + "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" +-"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" +-"\n" +-"\n" +-"Alternativamente, você pode especificar, na opção \"gpgkey\" da seção\n" +-" 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" ++msgstr "\nVocê habilitou a verificação de pacotes através de chaves GPG. Isso é uma boa coisa.\nEntretanto, você não tem nenhuma chave GPG pública instalada. Você precisa baixar\ne instalar essas chaves para os pacotes que deseja instalar.\nVocê pode fazer isso executando o comando:\n rpm --import public.gpg.key\n\n\nAlternativamente, você pode especificar, na opção \"gpgkey\" da seção\n do repositório, a url da chave que você gostaria de usar\npara ele e o yum irá instalá-la para você.\n\nPara mais informações contate o fornecedor da sua distribuição ou do pacote.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -106807,9 +109181,12 @@ index 493f090..c921d06 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1604,306 +1692,295 @@ msgstr "" - "Execute \"yum repolist all\" para ver os repositórios que você tem.\n" - "Você pode habilitar repositórios com yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Não há repositórios habilitados.\n" +-"Execute \"yum repolist all\" para ver os repositórios que você tem.\n" +-"Você pode habilitar repositórios com yum-config-manager --enable " ++msgstr "Não há repositórios habilitados.\nExecute \"yum repolist all\" para ver os repositórios que você tem.\nVocê pode habilitar repositórios com yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -107041,120 +109418,120 @@ index 493f090..c921d06 100644 msgstr "Exibe os repositórios de software configurados" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "habilitado" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "desabilitado" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Repo-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Repo-name : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Repo-status : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Repo-revision: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Repo-tags : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Repo-distro-tags: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Repo-updated : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Repo-pkgs : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Repo-size : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Repo-baseurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Repo-metalink: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Atualizados :" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Repo-mirrors : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Nunca (último: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Instante (último: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s segundo(s) (último: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Repo-expire : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Repo-exclude : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Repo-include : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Repo-excluded: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Nome do Arquivo repo: " @@ -107162,191 +109539,197 @@ index 493f090..c921d06 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "id do repo" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "nome do repo" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Exibe uma mensagem de uso para ajuda" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Nenhuma ajuda disponível para %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1913,7 +1990,7 @@ msgstr "" - "\n" - "apelidos: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"apelidos: " ++msgstr "\n\napelidos: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1923,117 +2000,163 @@ msgstr "" - "\n" - "apelido: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"apelido: " ++msgstr "\n\napelido: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Configurando o processo de reinstalação" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "reinstala um pacote" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Configurando o processo de desatualização" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "desatualizando um pacote" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Exibe uma versão para a máquina e/ou os repositórios disponíveis." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Grupos da versão do Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Grupo:" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Pacotes:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Instalados:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Grupos instalados:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Disponíveis:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Grupos disponíveis:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Exibir ou usar o histórico de transações" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Subcomando de histórico inválido, use: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Você não tem acesso ao banco de dados do histórico." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Procurar por problemas no rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "" +msgstr "Carregar uma transação salva de um nome de arquivo" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "Nenhum arquivo de transação salvo especificado." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "carregando transação de %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -107356,28 +109739,29 @@ index 493f090..c921d06 100644 #: ../yummain.py:84 #, python-format msgid " Yum checks failed: %s" +-msgstr "" +msgstr "A verificação do yum falhou: %s" -+ + +-#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" msgstr "" +-"Outro aplicativo está retendo o bloqueio do yum; esperando por ele para " +-"sair..." --#: ../yummain.py:114 +-#: ../yummain.py:120 +#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" + msgid "Can't create lock file; exiting" +-msgstr "" +msgstr "Não é possível criar o arquivo de bloqueio; saindo" + +#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Outro aplicativo está retendo o bloqueio do yum; esperando por ele para " - "sair..." ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Outro aplicativo está retendo o bloqueio do yum; esperando por ele para sair..." --#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -107398,282 +109782,291 @@ index 493f090..c921d06 100644 msgid "" "\n" "\n" -@@ -2043,75 +2166,75 @@ msgstr "" - "\n" - "Saindo pelo cancelamento do usuário." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Saindo pelo cancelamento do usuário." ++msgstr "\n\nSaindo pelo cancelamento do usuário." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 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:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 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" ++msgstr "Configurando TransactionSets antes da ativação da classe de configuração" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "tsflag inválido no arquivo de configuração: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Pesquisando pkgSack para a dep.: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Membro: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s convertido para instalar" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Adicionando pacote %s no modo %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Removendo pacote %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s requer: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s requer %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "O requerimento necessário já foi localizado, enganando" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, 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:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Fornecedor em potencial: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "O modo é %s para o fornecedor do %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Modo para o pacote que fornece o %s: %s" -@@ -2119,117 +2242,117 @@ msgstr "Modo para o pacote que fornece o %s: %s" +@@ -2119,1026 +2173,1029 @@ msgstr "Modo para o pacote que fornece o %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "Tentando atualizar %s para resolver a dependência" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "Sem caminhos de atualização encontrados para %s. Falha!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, 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:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, 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:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Atualizando %s para resolver a dependência." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, 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" ++msgstr "Não foi possível encontrar um caminho de atualização para a dep. para: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "%s localizado rapidamente a ser requerido por %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, 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:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, 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." +-msgstr "" +-"O pacote de solução em potencial %s tem uma instância mais nova no ct." ++msgstr "O pacote de solução em potencial %s tem uma instância mais nova no ct." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, 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." ++msgstr "O pacote de solução em potencial %s tem uma instância mais nova instalada." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s já está no ct, pulando esse" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Marcando %s como uma atualização para o %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Marcando %s como uma instalação para o %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Sucesso - transação vazia" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Reiniciando o loop" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Término do processo de dependências" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Sucesso - dependências resolvidas" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Verificando dependências para %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "procurando por %s como um requerimento do %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Executando compare_providers() para %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "melhor arquitetura no po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s torna %s obsoleto" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2238,142 +2361,142 @@ msgstr "" - "archdist comparou %s com %s em %s\n" - " Vencedor: %s" + " Winner: %s" +-msgstr "" +-"archdist comparou %s com %s em %s\n" +-" Vencedor: %s" ++msgstr "archdist comparou %s com %s em %s\n Vencedor: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "Sourcerpm comum %s e %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "o pacote base %s está instalado para o %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "prefixo comum de %s entre %s e %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "requer mínimo: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "Vencedor: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "Perdedor(com %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Melhor ordem: %s" @@ -107806,9 +110199,10 @@ index 493f090..c921d06 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2381,21 +2504,21 @@ msgstr "" - "Há transações não finalizadas restantes. Você pode considerar executar o " - "yum-complete-transaction primeiro para finalizá-las." +-msgstr "" +-"Há transações não finalizadas restantes. Você pode considerar executar o " +-"yum-complete-transaction primeiro para finalizá-las." ++msgstr "Há transações não finalizadas restantes. Você pode considerar executar o yum-complete-transaction primeiro para finalizá-las." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -107833,9 +110227,10 @@ index 493f090..c921d06 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2403,89 +2526,92 @@ msgstr "" - "\n" - "Pacotes ignorados devido a problemas de dependências:" +-msgstr "" +-"\n" +-"Pacotes ignorados devido a problemas de dependências:" ++msgstr "\nPacotes ignorados devido a problemas de dependências:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -107848,9 +110243,10 @@ index 493f090..c921d06 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Encontrado(s) %d problema(s) pré-existente(s) do rpmdb, saída do 'yum " - "check' a seguir:" +-msgstr "" +-"** Encontrado(s) %d problema(s) pré-existente(s) do rpmdb, saída do 'yum " +-"check' a seguir:" ++msgstr "** Encontrado(s) %d problema(s) pré-existente(s) do rpmdb, saída do 'yum check' a seguir:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -107871,8 +110267,9 @@ index 493f090..c921d06 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação." +-msgstr "" +-"Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação." ++msgstr "Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -107894,7 +110291,7 @@ index 493f090..c921d06 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s deveria ter sido instalado mas não foi!" @@ -107905,24 +110302,22 @@ index 493f090..c921d06 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s deveria ter sido removido mas não foi!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Não foi possível abrir a trava %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Não foi possível abrir a trava %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Não foi possível verificar se o PID %s está ativo" - +-#, 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:1789 +#: ../yum/__init__.py:1917 @@ -107932,39 +110327,54 @@ index 493f090..c921d06 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Não foi possível criar um bloqueio em %s: %s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Não foi possível abrir a trava %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Não foi possível verificar se o PID %s está ativo" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2494,41 +2620,30 @@ msgstr "" - "O Pacote não coincide com o download pretendido. Sugestão: execute yum " "--enablerepo=%s clean metadata" +-msgstr "" +-"O Pacote não coincide com o download pretendido. Sugestão: execute yum " +-"--enablerepo=%s clean metadata" ++msgstr "O Pacote não coincide com o download pretendido. Sugestão: execute yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Não foi possível realizar a soma de verificação" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "O pacote não corresponde à soma de verificação" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, 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" ++msgstr "o pacote falhou na soma de verificação mas o cache está habilitado para o %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "usando cópia local do %s" @@ -107981,69 +110391,70 @@ index 493f090..c921d06 100644 -" * necessário %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "O cabeçalho não está completo." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2536,62 +2651,64 @@ 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." +-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." ++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:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, 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:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problema ao abrir o pacote %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, 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:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "O pacote %s não está assinado" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Não foi possível remover %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s removido" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Não foi possível remover %s arquivo %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s arquivo %s removido" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s arquivos removidos" @@ -108053,28 +110464,29 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, 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:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, 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:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2599,121 +2716,124 @@ msgstr "" - "searchPackages() será removida em uma futura versão do Yum. Ao invés disso, " - "use a searchGenerator().\n" +-msgstr "" +-"searchPackages() será removida em uma futura versão do Yum. Ao invés disso, " +-"use a searchGenerator().\n" ++msgstr "searchPackages() será removida em uma futura versão do Yum. Ao invés disso, use a searchGenerator().\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Pesquisando por %d pacotes" @@ -108084,63 +110496,63 @@ index 493f090..c921d06 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "pesquisando pelo pacote %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "pesquisando nas entradas do arquivo" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "pesquisando nas entradas dos fornecimentos" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Nenhum dado de grupos disponível para os repositório configurados" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Não existe nenhum grupo de nome %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, 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:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Adicionando o pacote %s do grupo %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, 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:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "Aviso: O Grupo %s não tem nenhum pacote." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -108149,144 +110561,146 @@ index 493f090..c921d06 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, 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:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "A tupla %s do pacote não pôde ser localizada no rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Nenhum pacote encontrado para %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 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:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Nada especificado para instalar" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, 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:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Nenhuma correspondência para o argumento: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Pacote %s instalado, mas não disponível" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Nenhum pacote disponível para instalar" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Pacote: %s - já está no conjunto de transações" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "O pacote %s foi tornado obsoleto pelo %s, o qual já está instalado" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2721,83 +2841,89 @@ msgid "" - msgstr "" - "O pacote %s foi tornado obsoleto por %s, mas este não provê os requisitos." + "requirements" +-msgstr "" +-"O pacote %s foi tornado obsoleto por %s, mas este não provê os requisitos." ++msgstr "O pacote %s foi tornado obsoleto por %s, mas este não provê os requisitos." -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso" +-msgstr "" +-"O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso" ++msgstr "O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, 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:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "O pacote %s já está instalado. Verificando por uma atualização." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Atualizando tudo" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Pacote já obsoleto não será atualizado: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, 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:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Não atualizando o pacote que está obsoleto: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Pacote já atualizado não será atualizado novamente: %s.%s %s:%s-%s" @@ -108294,193 +110708,195 @@ index 493f090..c921d06 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nenhum pacote encontrado para remoção" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Ignorando o kernel em execução: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Removendo %s da transação" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Não foi possível abrir: %s. Ignorando." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Examinando %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Não é possível instalar localmente o deltarpm: %s. Ignorando." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2805,13 +2931,13 @@ msgstr "" - "Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura" - " compatível." +-msgstr "" +-"Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura" +-" compatível." ++msgstr "Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura compatível." -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Não é possível instalar o pacote % s. É obsoleto pelo pacote instalado %s" +-msgstr "" +-"Não é possível instalar o pacote % s. É obsoleto pelo pacote instalado %s" ++msgstr "Não é possível instalar o pacote % s. É obsoleto pelo pacote instalado %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2820,137 +2946,148 @@ msgstr "" - "O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum " - "install para instalá-lo." + "instead." +-msgstr "" +-"O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum " +-"install para instalá-lo." ++msgstr "O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum install para instalá-lo." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" " instead." - msgstr "" -+"Pacote %s.%s não instalado, não pode ser atualizado. Execute yum install " -+"para instalá-lo em vez disso." +-msgstr "" ++msgstr "Pacote %s.%s não instalado, não pode ser atualizado. Execute yum install para instalá-lo em vez disso." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Excluindo %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Marcando %s para ser instalado" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Marcando %s como uma atualização do %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: não atualiza o pacote instalado." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Não foi possível abrir o arquivo: %s. Ignorando." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Problema na reinstalação: nenhum pacote encontrado para remoção" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problema na reinstalação: nenhum pacote %s encontrado para instalação" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Nenhum pacote disponível para ser desatualizado" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "O pacote %s permite múltiplas instalações, ignorando" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Nenhuma correspondência disponível para o pacote: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Somente a atualização está disponível para o pacote: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Falha ao desatualizar: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 #, python-format -msgid "Retrieving key from %s" +msgid "Failed to upgrade: %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 +#, python-format +msgid "Retrieving key from %s" +msgstr "Recuperando chave de %s" + -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "A obtenção da chave GPG falhou:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" -+"Assinatura da chave GPG na chave %s não combina com a chave CA para o " -+"repositório: %s" +-msgstr "" ++msgstr "Assinatura da chave GPG na chave %s não combina com a chave CA para o repositório: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "Assinatura da chave GPG verificada em relação a chave(s) CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "A chave GPG de %s é inválida: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Falha na análise da chave GPG: ela não tem o valor %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -108494,7 +110910,7 @@ index 493f090..c921d06 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -108506,191 +110922,194 @@ index 493f090..c921d06 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "A chave GPG em %s (0x%s) já está instalada" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Falha na importação da chave (código %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Chave importada com sucesso" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" -msgstr "" +msgstr "Não instalar nenhuma das chaves" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2959,25 +3096,25 @@ 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." + "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." ++msgstr "As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas para este pacote.\nVerifique se as URLs corretas das chaves estão configuradas para esse repositório." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 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:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "A chave GPG em %s (0x%s) já foi importada" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Falha na importação da chave" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "Não instalar nenhuma das chaves para o repositório %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2986,159 +3123,185 @@ msgstr "" - "As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas.\n" - "Verifique se as URLs das chaves estão configuradas corretamente para este repositório. " + "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.\n" +-"Verifique se as URLs das chaves estão configuradas corretamente para este repositório. " ++msgstr "As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas.\nVerifique se as URLs das chaves estão configuradas corretamente para este repositório. " -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Não foi possível encontrar um espelho apropriado." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Foram encontrados erros ao baixar os pacotes." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Por favor, relate esse erro em %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Erros do teste de transação:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Não foi possível definir a cachedir: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" -+"Dependências não resolvidas. Transações não resolvidas não serão salvas." +-msgstr "" ++msgstr "Dependências não resolvidas. Transações não resolvidas não serão salvas." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "Não foi possível salvar o arquivo de transação %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "Não foi possível acessar/ler a transação salva %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." -msgstr "" +msgstr "ignorando, conforme solicitado." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." -msgstr "" +msgstr "abortando." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "Não foi possível encontrar txmbr: %s da origem: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" - msgstr "" -+"ignorando, conforme pedido. Você deve rodar executar novamente o depsolve!" ++msgstr "ignorando, conforme pedido. Você deve rodar executar novamente o depsolve!" + +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." -+msgstr "" + msgstr "" #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 @@ -108739,9 +111158,10 @@ index 493f090..c921d06 100644 +#: ../yum/plugins.py:326 #, 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" +-msgstr "" +-"Dois ou mais plugins com o nome \"%s\" existem no caminho de pesquisa " +-"plugins" ++msgstr "Dois ou mais plugins com o nome \"%s\" existem no caminho de pesquisa plugins" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -108789,24 +111209,43 @@ index 493f090..c921d06 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s provê %s mas não pôde ser achado" -@@ -3147,6 +3310,17 @@ msgstr "%s provê %s mas não pôde ser achado" +@@ -3147,6 +3204,19 @@ msgstr "%s provê %s mas não pôde ser achado" msgid "Repackaging" msgstr "Reempacotando" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Espaço insuficiente no diretório de download %s\n" -+" * livre %s\n" -+" * necessário %s" ++msgstr "Espaço insuficiente no diretório de download %s\n * livre %s\n * necessário %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3159,9 +3229,7 @@ msgstr "O RPM %s não passou na verificação md5" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Não foi possível abrir o banco de dados RPM para leitura. Talvez por que ele" +-" já esteja em uso?" ++msgstr "Não foi possível abrir o banco de dados RPM para leitura. Talvez por que ele já esteja em uso?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3177,5 +3245,3 @@ msgstr "Cabeçalho %s danificado" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Erro ao abrir o rpm %s - erro %s" +- +- diff --git a/po/pygettext.py b/po/pygettext.py index 276a433..7f13138 100644 --- a/po/pygettext.py @@ -108818,10 +111257,10 @@ index 276a433..7f13138 100644 # # minimally patched to make it even more xgettext compatible diff --git a/po/ru.po b/po/ru.po -index 52ba58b..eaacef7 100644 +index 52ba58b..c8480c9 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2,15 +2,16 @@ +@@ -2,950 +2,970 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -108829,26 +111268,28 @@ index 52ba58b..eaacef7 100644 -# Misha Shnurapet , 2011 +# Translators: +# Misha Shnurapet , 2011. -+# Misha Shnurapet , 2011. ++# Misha Shnurapet , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" -+"Last-Translator: james \n" - "Language-Team: Russian (http://www.transifex.net/projects/p/yum/team/ru/)\n" +-"Language-Team: Russian (http://www.transifex.net/projects/p/yum/team/ru/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2012-02-18 08:50+0000\n" ++"Last-Translator: Misha Shnurapet \n" ++"Language-Team: Russian (http://www.transifex.net/projects/p/yum/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -18,122 +19,125 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Обновление" @@ -108859,31 +111300,31 @@ index 52ba58b..eaacef7 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Установка" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Исключено" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Обновлено" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Удалено" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Установлено" @@ -108910,7 +111351,7 @@ index 52ba58b..eaacef7 100644 msgstr "Удален: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Удаление" @@ -108920,69 +111361,69 @@ index 52ba58b..eaacef7 100644 msgstr "Очистка" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Команда \"%s\" уже используется" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Настройка репозиториев" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Чтение локальных метаданных для репозиториев" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Ошибка в настройке: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Ошибка в параметре: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Установлено: %s-%s из %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Собрано : %s из %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Передано : %s из %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Необходимо задать команду" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Не найдена команда: %s Пожалуйста, воспользуйтесь %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Требование к носителю:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Необходимо по меньшей мере %dМБ на разделе %s.\n" @@ -108994,102 +111435,104 @@ index 52ba58b..eaacef7 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -141,60 +145,60 @@ msgstr "" - "Сводка ошибок\n" - "-------------\n" +-msgstr "" +-"Сводка ошибок\n" +-"-------------\n" ++msgstr "Сводка ошибок\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Попытка предпринята, делать нечего. Завершение." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Выход по запросу пользователя" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Загрузка пакетов:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Ошибка загрузки пакетов:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Проверка сценария" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ОШИБКА — необходимо обновить RPM для обработки:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "ОШИБКА при проверке сценария на этапе зависимостей:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "Следует обновить RPM" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Пожалуйста, сообщите об ошибке в %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Проверяем сценарий" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Проверка сценария завершена с ошибкой:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Проверка сценария прошла успешно" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Выполнение сценария" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -202,240 +206,271 @@ msgstr "" - "Отмена автоматического импорта ключей во время запуска без контроля.\n" - "Используйте \"-y\" для игнорирования." +-msgstr "" +-"Отмена автоматического импорта ключей во время запуска без контроля.\n" +-"Используйте \"-y\" для игнорирования." ++msgstr "Отмена автоматического импорта ключей во время запуска без контроля.\nИспользуйте \"-y\" для игнорирования." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Возможно, вы имели в виду: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Пакет %s%s%s доступен, но не установлен." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Пакета с названием %s%s%s не найдено." @@ -109097,88 +111540,88 @@ index 52ba58b..eaacef7 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Пакет(ы) для установки" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет к установке" ++msgstr[1] "%d пакета к установке" ++msgstr[2] "%d пакетов к установке" -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Выполнять нечего" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d пакеты отмечены для обновления" +msgid "%d package marked for Update" +msgid_plural "%d packages marked for Update" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет помечен для обновления" ++msgstr[1] "%d пакета помечено для обновления" ++msgstr[2] "%d пакетов помечено для обновления" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Пакетов, отмеченных для обновления, нет." -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "Отмечено пакетов для синхронизации: %d" +msgid "%d package marked for Distribution Synchronization" +msgid_plural "%d packages marked for Distribution Synchronization" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет помечен для синхронизации" ++msgstr[1] "%d пакета помечены для синхронизации" ++msgstr[2] "%d пакетов помечено для синхронизации" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Пакетов, отмеченных для синхронизации, нет" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d пакеты отмечены для удаления" +msgid "%d package marked for removal" +msgid_plural "%d packages marked for removal" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет помечен для удаления" ++msgstr[1] "%d пакета помечены к удалению" ++msgstr[2] "%d пакетов помечено к удалению" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Пакетов, отмеченных для удаления, нет." -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Пакет(ы) для отката версии" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет для отката" ++msgstr[1] "%d пакета для отката" ++msgstr[2] "%d пакетов для отката" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (из %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Установленный пакет %s%s%s%s недоступен." @@ -109186,803 +111629,815 @@ index 52ba58b..eaacef7 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Пакет(ы) для переустановки" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет для переустановки" ++msgstr[1] "%d пакета для переустановки" ++msgstr[2] "%d пакетов для переустановки" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Пакеты не предоставлены" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Пакет(ы) для установки" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "Совпадений: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" +-msgstr "" -" Название и описание совпадают только с %sonly%s, используйте «search all»," -" чтобы искать везде." -+" Показаны %sтолько%s совпадения по названиям и описаниям, для большего " -+"используйте «search all»." ++msgstr " Показаны %sтолько%s совпадения по названиям и описаниям, для большего используйте «search all»." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" +-msgstr "" -" Полное название и описание совпадают только с %sonly%s, используйте " -"«search all», чтобы искать везде." -+" Показаны %sтолько%s полные совпадения по названиям и описаниям, для " -+"большего используйте «search all»." ++msgstr " Показаны %sтолько%s полные совпадения по названиям и описаниям, для большего используйте «search all»." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Совпадений: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" +-msgstr "" -" Название и описание совпадают с %smostly%s, используйте «search all», " -"чтобы искать везде." -+" Показаны %sв основном%s совпадения по названияю и описанию, для большего " -+"используйте «search all»." ++msgstr " Показаны %sв основном%s совпадения по названияю и описанию, для большего используйте «search all»." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Внимание: совпадений для %s не найдено" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Совпадений не найдено" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Пакет для %s не найден" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Сброс источников:" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Очистка всего" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Очистка заголовков" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Очистка пакетов" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Очистка xml метаданных" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Очистка кэша данных" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Очистка устаревшего кэша" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Очистка кэша данных базы RPM" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Сброс модулей" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Предупреждение: Ни одна группа не совпадает: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Установлены коллекции:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Установлены языковые пакеты:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Доступные коллекции:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Доступные языковые пакеты:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Выполнено" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Внимание: коллекции %s не существует." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Во всех указанных коллекциях пакеты для установки или обновления отсутствуют" +-msgstr "" +-"Во всех указанных коллекциях пакеты для установки или обновления отсутствуют" ++msgstr "Во всех указанных коллекциях пакеты для установки или обновления отсутствуют" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d Пакет(ы) для установки" +msgid "%d package to Install" +msgid_plural "%d packages to Install" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет к установке" ++msgstr[1] "%d пакета к установке" ++msgstr[2] "%d пакетов к установке" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Коллекции с названием %s не существует" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Нет пакетов для удаления из коллекций" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d Пакет(ы) для удаления" +msgid "%d package to remove" +msgid_plural "%d packages to remove" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d пакет к удалению" ++msgstr[1] "%d пакета к удалению" ++msgstr[2] "%d пакетов к удалению" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Пакет %s уже установлен, пропускаем" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Исключение несовместимого пакета %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Других %s не установлено, добавляем в список для возможной установки" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Опции модуля" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Ошибка команды: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -446,289 +481,293 @@ msgstr "" "\n" - "%s: %s опцию необходимо указать с аргументом" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s опцию необходимо указать с аргументом" ++msgstr "\n\n%s: %s опцию необходимо указать с аргументом" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color возможное значение: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot должен указывать абсолютный путь: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "отобразить помощь и выйти" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "игнорировать ошибки" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "брать полностью из системного кэша, не обновлять его" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "расположение файла конфигурации" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "максимальное время ожидания команды" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "уровень отладочных сообщений" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" - msgstr "" - "показывать повторяющиеся в репозиториях пакеты, для команд list/search" +-msgstr "" +-"показывать повторяющиеся в репозиториях пакеты, для команд list/search" ++msgstr "показывать повторяющиеся в репозиториях пакеты, для команд list/search" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "уровень сообщений об ошибках" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "уровень отладочных сообщений для rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "работать без вывода сообщений" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "подробно описывать действия" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "Отвечать утвердительно на все вопросы" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" -+msgstr "" ++msgstr "ответ нет для всех вопросов" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "показать версию Yum и выйти" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "настройка корневой папки" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "включение одного и более репозиториев (поиск по шаблону поддерживается)" +-msgstr "" +-"включение одного и более репозиториев (поиск по шаблону поддерживается)" ++msgstr "включение одного и более репозиториев (поиск по шаблону поддерживается)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "выключение одного и более репозиториев (поиск по шаблону поддерживается)" +-msgstr "" +-"выключение одного и более репозиториев (поиск по шаблону поддерживается)" ++msgstr "выключение одного и более репозиториев (поиск по шаблону поддерживается)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "исключение пакета(ов) по имени или регулярному выражению" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "отключает исключения для конкретного репозитория или для всех" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "включить обработку устаревших во время обновления" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "отключить модули Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "отключить проверку подписи gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "отключить модуль по названию" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "включить модуль по названию" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "пропускать пакеты, с проблемами в зависимостях" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "Использовать ли цветовые схемы" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "установите значение $releasever в конфигурационном файле yum и в файлах " - "репозиториев (repo)" +-msgstr "" +-"установите значение $releasever в конфигурационном файле yum и в файлах " +-"репозиториев (repo)" ++msgstr "установите значение $releasever в конфигурационном файле yum и в файлах репозиториев (repo)" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "другие настройки и свойства источников" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "Янв" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "Фев" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "Мар" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "Апр" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "Май" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "Июн" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "Июл" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "Авг" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "Сен" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "Окт" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "Ноя" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "Дек" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Пробуем другое зеркало." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Название: %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Архитектура: %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Период: %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Версия: %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Выпуск: %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Объем: %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Источник: %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Из источника: %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Создатель: %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Время создания: %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Время сборки: %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Время установки: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Установил: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Изменил: %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Аннотация: " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "Ссылка: %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Лицензия: " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Описание: " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "да" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "нет" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Продолжить? [y/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -737,154 +776,157 @@ msgstr "" - "\n" - "Коллекция: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Коллекция: %s" ++msgstr "\nКоллекция: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Код коллекции: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Описание: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Язык: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Обязательные пакеты:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Пакеты по умолчанию:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Опциональные пакеты:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Зависимые пакеты:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "пакет: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " У этого пакета нет зависимостей" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " зависимость: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Неудовлетворенная зависимость" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Совпадения с:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Лицензия : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Имя файла : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Другое : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Произошла ошибка при подсчете общего объема загрузки" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Общий размер: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Объем загрузки: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Объем изменений: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Ошибка при подсчете объема установки" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Переустановка" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Откат версии" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Установка зависимостей" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Обновление зависимостей" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Удаление зависимостей" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Пропущено (ошибка зависимостей)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Не установлено" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Недоступно" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Пакет" +msgid_plural "Packages" +msgstr[0] "Пакет" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[1] "Пакета" ++msgstr[2] "Пакеты" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Архитектура" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Версия" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Репозиторий " -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Размер" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " замена %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -895,57 +937,59 @@ msgstr "" - "Результат операции\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Результат операции\n" +-"%s\n" ++msgstr "\nРезультат операции\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Установить %5.5s пакет(а,ов)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Установка " @@ -109990,23 +112445,23 @@ index 52ba58b..eaacef7 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Обновить %5.5s пакет(а,ов)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" -+msgstr "" ++msgstr "Обновление" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Удалить %5.5s пакет(а,ов)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" -+msgstr "" ++msgstr "Удалить" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Переустановить %5.5s пакет(а,ов)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Переустановка" @@ -110014,323 +112469,327 @@ index 52ba58b..eaacef7 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Откатить %5.5s пакет(а,ов)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Откат версии" + -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "Зависимый пакет" ++msgstr[1] "Зависимых пакета" ++msgstr[2] "Зависимые пакеты" -#: ../output.py:1165 -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Удалено" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Удалены зависимости" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Установлены зависимости" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Обновлены зависимости" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Заменено" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Неудача" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "двух" -@@ -953,7 +997,7 @@ msgstr "двух" +@@ -953,563 +973,598 @@ msgstr "двух" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -964,364 +1008,416 @@ msgstr "" - " Текущая загрузка отменена, %sпрервите (ctrl-c) повторно%s в течение %s%s%s секунд,\n" - "чтобы выйти.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Текущая загрузка отменена, %sпрервите (ctrl-c) повторно%s в течение %s%s%s секунд,\n" +-"чтобы выйти.\n" ++msgstr "\n Текущая загрузка отменена, %sпрервите (ctrl-c) повторно%s в течение %s%s%s секунд,\nчтобы выйти.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "прервано пользователем" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Общий размер" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Система" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Переход от %d к %d, т.к. сценарии пересекаются" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Сценарии отсутствуют" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Заданы неверный код сценария или пакеты" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Командная строка" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Вход пользователя" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Дата и время" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Действия" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Изменено" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Код действия не задан" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Код действия неверен" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Указанный код действия не найден" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Указано более одной операции!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Не задан код действия или пакет" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Откачено" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Старее" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Новее" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Код операции :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Время начала :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Начало rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u секунд)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u минут)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u часов)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u дней)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Конечное время :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Конец rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Пользователь :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Код возврата :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Прекращено" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Ошибки:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Неудача:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Успешно" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Команда:" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Имеется дополнительная информация: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Действие выполнено:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Пакеты изменены:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Пропущены пакеты:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Ошибки в rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Вывод сценария:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Ошибки:" @@ -110339,17 +112798,17 @@ index 52ba58b..eaacef7 100644 -msgstr "Установка " - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Установка зависимостей" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Исключаем" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Удаление" @@ -110362,297 +112821,315 @@ index 52ba58b..eaacef7 100644 -msgstr "Откат версии" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Обновление" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Время" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "За последний день" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "За последнюю неделю" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "За последние 2 недели" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "За последние 3 месяца" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "За последние 6 месяцев" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "За последний год" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Более года назад" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Действие %s не найдено" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Код операции:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Имеется информация о ранних действиях:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: По этому названию других данных нет" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" -+msgstr "" ++msgstr "Пакет :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" -+msgstr "" ++msgstr "Состояние :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" -+msgstr "" ++msgstr "Размер :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" -+msgstr "" ++msgstr "Узел сборки :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" -+msgstr "" ++msgstr "Время сборки :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" -+msgstr "" ++msgstr "Сборщик :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" -+msgstr "" ++msgstr "Поставщик :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" -+msgstr "" ++msgstr "Лицензия :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" -+msgstr "" ++msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" -+msgstr "" ++msgstr "Исходный RPM :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" -+msgstr "" ++msgstr "Получено :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" -+msgstr "" ++msgstr "Отправитель :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" -+msgstr "" ++msgstr "Причина :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" -+msgstr "" ++msgstr "Репозиторий :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" -+msgstr "" ++msgstr "Установлен :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" -+msgstr "" ++msgstr "Изменен :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "для установки" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" - msgstr "обновление" +-msgstr "обновление" ++msgstr "как обновление" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "для удаления" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "для переустановки" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" - msgstr "откат" +-msgstr "откат" ++msgstr "как версия для отката" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" - msgstr "исключение" +-msgstr "исключение" ++msgstr "для исключения" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "для обновления" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "как недействительный" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Пакет %s.%s %s:%s-%s помечен %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Проверка сценария" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Перепроверка зависимостей с новыми параметрами." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Проверка зависимостей окончена" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Обработка зависимостей: %s пакета: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Сохранен пакет: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Неразрешённая зависимость: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Пакет: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1330,7 +1426,7 @@ msgstr "" - "\n" - " Необходимо: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Необходимо: %s" ++msgstr "\n Необходимо: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1339,7 +1435,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1348,7 +1444,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1357,86 +1453,86 @@ msgstr "" - " Не найдено" +-msgstr "" +-"\n" +-" Не найдено" ++msgstr "\n Не найдено" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Обновил" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Откатил" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Заменил" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Доступно" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Обработка конфликта: %s конфликтует с %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Заполнение списка действий выбранными пакетами. Подождите, пожалуйста." +-msgstr "" +-"--> Заполнение списка действий выбранными пакетами. Подождите, пожалуйста." ++msgstr "--> Заполнение списка действий выбранными пакетами. Подождите, пожалуйста." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Загрузка заголовка %s для включения в список." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Проверка" ++ +#: ../utils.py:129 msgid "Running" msgstr "Запуск" @@ -110678,7 +113155,7 @@ index 52ba58b..eaacef7 100644 msgstr "Трассировано/Остановлено" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Неизвестно" @@ -110716,27 +113193,37 @@ index 52ba58b..eaacef7 100644 msgid "" "\n" "\n" -@@ -1446,7 +1542,7 @@ msgstr "" - "\n" - "Выход по запросу пользователя" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Выход по запросу пользователя" ++msgstr "\n\nВыход по запросу пользователя" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1456,7 +1552,7 @@ msgstr "" - "\n" - "Выход из-за разрыва связи" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Выход из-за разрыва связи" ++msgstr "\n\nВыход из-за разрыва связи" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1467,41 +1563,41 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -110784,16 +113271,17 @@ index 52ba58b..eaacef7 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1509,7 +1605,7 @@ msgstr "" - "\n" - "Зависимости определены" +-msgstr "" +-"\n" +-"Зависимости определены" ++msgstr "\nЗависимости определены" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Выполнено!" -@@ -1521,7 +1617,7 @@ msgstr " Сокращённое использование:\n" +@@ -1521,7 +1576,7 @@ msgstr " Сокращённое использование:\n" msgid "You need to be root to perform this command." msgstr "Для выполнения этой команды необходимы привилегии суперпользователя." @@ -110802,9 +113290,25 @@ index 52ba58b..eaacef7 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1551,57 +1647,57 @@ msgstr "" +@@ -1536,479 +1591,482 @@ msgid "" + "will install it for you.\n" "\n" - "Чтобы узнать больше, пожалуйста, свяжитесь с поставщиком дистрибутива или пакета.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Вы включили проверку пакетов при помощи ключей GPG. Это хорошо.\n" +-"Однако, у вас не установлено публичных ключей GPG. Вам необходимо скачать\n" +-"ключи для пакетов которые хотите установить, и затем запускать установку.\n" +-"Вы можете выполнить это при помощи команды\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Вы также можете ввести адрес ключ, который будет использоваться\n" +-"для репозитория. Опция 'gpgkey' в секции репозитория и Yum\n" +-"установит его за Вас.\n" +-"\n" +-"Чтобы узнать больше, пожалуйста, свяжитесь с поставщиком дистрибутива или пакета.\n" ++msgstr "\nВы включили проверку пакетов при помощи ключей GPG. Это хорошо.\nОднако, у вас не установлено публичных ключей GPG. Вам необходимо скачать\nключи для пакетов которые хотите установить, и затем запускать установку.\nВы можете выполнить это при помощи команды\n rpm --import public.gpg.key\n\n\nВы также можете ввести адрес ключ, который будет использоваться\nдля репозитория. Опция 'gpgkey' в секции репозитория и Yum\nустановит его за Вас.\n\nЧтобы узнать больше, пожалуйста, свяжитесь с поставщиком дистрибутива или пакета.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -110856,25 +113360,30 @@ index 52ba58b..eaacef7 100644 +#: ../yumcommands.py:167 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "" - "Файл %s переданный в качестве аргумента для командной оболочки не " - "существует." +-msgstr "" +-"Файл %s переданный в качестве аргумента для командной оболочки не " +-"существует." ++msgstr "Файл %s переданный в качестве аргумента для командной оболочки не существует." -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 msgid "Error: more than one file given as argument to shell." - msgstr "" - "Ошибка: более чем один файл указан в качестве аргумента для командной " - "оболочки." +-msgstr "" +-"Ошибка: более чем один файл указан в качестве аргумента для командной " +-"оболочки." ++msgstr "Ошибка: более чем один файл указан в качестве аргумента для командной оболочки." -#: ../yumcommands.py:148 +#: ../yumcommands.py:192 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1611,306 +1707,295 @@ msgstr "" - "Выполните «yum repolist all» для вывода списка доступных.\n" - "Включение производится командой yum-config-manager --enable [источник]" + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Все источники пакетов отключены.\n" +-"Выполните «yum repolist all» для вывода списка доступных.\n" +-"Включение производится командой yum-config-manager --enable [источник]" ++msgstr "Все источники пакетов отключены.\nВыполните «yum repolist all» для вывода списка доступных.\nВключение производится командой yum-config-manager --enable [источник]" -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -110975,7 +113484,7 @@ index 52ba58b..eaacef7 100644 -#: ../yumcommands.py:435 +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" -+msgstr "" ++msgstr "Отображать и использовать данные о коллекциях" + +#: ../yumcommands.py:776 msgid "Setting up Group Process" @@ -111004,7 +113513,7 @@ index 52ba58b..eaacef7 100644 +#: ../yumcommands.py:833 +#, python-format +msgid "Invalid groups sub-command, use: %s." -+msgstr "" ++msgstr "Некорректная команда для коллекции, используйте: %s" -#: ../yumcommands.py:550 +#: ../yumcommands.py:929 @@ -111106,120 +113615,120 @@ index 52ba58b..eaacef7 100644 msgstr "Отобразить сконфигурированные репозитории ПО" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "включено" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "отключено" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Код репозитория : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Имя репозитория : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Состояние репозитория: " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Ревизия репозитория : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Метки репозитория : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Метки дистрибутива : " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Репозиторий обновлен : " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Пакеты репозитория : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Размер репозитория : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "baseurl репозитория : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "metalink репозитория : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Обновлено : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Зеркала репозитория : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Никогда (последний: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "момент (осталось:%s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s секунд(а) (осталось: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Окончание срока репозитория: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Исключения репозитория : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Включено в репозиторий : " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Исключено из репозитория : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Файл репозитория:" @@ -111227,192 +113736,198 @@ index 52ba58b..eaacef7 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "Идентификатор репозитория" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "состояние" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "репозиторий" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Отобразить подсказку к использованию" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Помощь недоступна для %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1920,7 +2005,7 @@ msgstr "" - "\n" - "альтернативные названия: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"альтернативные названия: " ++msgstr "\n\nальтернативные названия: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1930,85 +2015,125 @@ msgstr "" - "\n" - "альтернативное название: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"альтернативное название: " ++msgstr "\n\nальтернативное название: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Подготовка к повторной установке" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "переустановка пакета" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Подготовка к откату версии" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "откат к предыдущей версии пакета" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Отображает версию для вашей архитектуры и/или доступные репозитории." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Группы версий Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Коллекция :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Пакеты :" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Установлен(ы):" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Установлены коллекции:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Доступен(ы):" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Доступны коллекции :" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Отобразить (или использовать) журнал операций" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" -+msgstr "" ++msgstr "Транзакции:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" -+msgstr "" ++msgstr "Время начала :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" -+msgstr "" ++msgstr "Время оканчивания :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" -+msgstr "" ++msgstr "Количество:" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" -+msgstr "" ++msgstr " база данных rpm :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" -+msgstr "" ++msgstr " база данных yum :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Неверная подкоманда журнала, используйте: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Нет доступа к спискам предыдущих действий." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Проверка проблем в базе данных RPM" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "загрузить сохранённый сценарий из файла" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "Не указан файл сценария." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "загрузка сценария из %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Сценарий загружен из %s с %s членами" -@@ -2019,26 +2144,32 @@ msgstr "Сценарий загружен из %s с %s членами" +@@ -2019,103 +2077,106 @@ msgstr "Сценарий загружен из %s с %s членами" msgid " Yum checks failed: %s" msgstr " Неудачных проверок Yum: %s" @@ -111422,7 +113937,7 @@ index 52ba58b..eaacef7 100644 -msgstr "Еще одно приложение, в настоящее время блокирует Yum. Подождите..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" ++msgstr "Чтение и запуск в текущем каталоге невозможны, переход в /" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -111448,284 +113963,290 @@ index 52ba58b..eaacef7 100644 +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" -+msgstr "" ++msgstr "Текущая транзакция сохранена, чтобы перезапустить:\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2048,74 +2179,74 @@ msgstr "" - "\n" - "Выход по запросу пользователя" + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Выход по запросу пользователя" ++msgstr "\n\nВыход по запросу пользователя" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() будет устранен в следующей версии Yum\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Составление списка действий до включения класса конфигурации" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Неверный tsflag в конфигурационном файле: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Поиск набора пакетов для зависимости: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Член: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s преобразован для установки" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Добавление пакета %s в режиме %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Удаление пакета %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s требуется: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s требуется %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Необходимое требование уже было было уже найдено, сжульничаем" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Требуемая зависимость не является именем пакета. Поиск: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Возможный поставщик: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Режим %s для поставщика %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Режим для пакета, предоставяющего %s: %s" -@@ -2123,115 +2254,115 @@ msgstr "Режим для пакета, предоставяющего %s: %s" +@@ -2123,1028 +2184,1031 @@ msgstr "Режим для пакета, предоставяющего %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Пробую обновить %s чтобы решить зависимость" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Не найдено путей обновления для %s. Срыв!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s пакет необходимый для %s был помечен для удаления" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: Замена устаревшего %s пакета пакетом %s чтобы разрешить зависимости." +-msgstr "" +-"TSINFO: Замена устаревшего %s пакета пакетом %s чтобы разрешить зависимости." ++msgstr "TSINFO: Замена устаревшего %s пакета пакетом %s чтобы разрешить зависимости." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Обновление %s для разрешения зависимостей." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Не удается найти путь обновления зависимости для: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Быстро подобран пакет %s в качестве требуемого для %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "Зависимый пакет %s уже установлен и будет пропущен" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Пакет %s в сценарии новее доступного" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Более новый пакет %s уже установлен в систему." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s уже в списке к действию, пропускаем его" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: %s отмечен как обновление для %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Отмечен %s чтобы установить %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Успешно — пустой сценарий" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Перезапуск цикла" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Завершение процесса разрешения зависимостей" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Успешно — зависимости определены" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Проверка зависимостей для %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "поиск %s требуется для %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Запуск compare_providers() для %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "Лучший архив в %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s исключает %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2240,142 +2371,142 @@ msgstr "" - "Сравнение archdist %s с %s в %s\n" - " Лучший: %s" + " Winner: %s" +-msgstr "" +-"Сравнение archdist %s с %s в %s\n" +-" Лучший: %s" ++msgstr "Сравнение archdist %s с %s в %s\n Лучший: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "общий источник RPM %s и %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "базовый пакет %s установлен для %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "Общий префикс %s для %s и %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "минимально: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "Лучший: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "Худший (c %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Лучший выбор: %s" @@ -111858,9 +114379,10 @@ index 52ba58b..eaacef7 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2383,21 +2514,21 @@ msgstr "" - "Остались незавершенные действия. Возможно, сначала следует выполнить yum-" - "complete-transaction для их завершения." +-msgstr "" +-"Остались незавершенные действия. Возможно, сначала следует выполнить yum-" +-"complete-transaction для их завершения." ++msgstr "Остались незавершенные действия. Возможно, сначала следует выполнить yum-complete-transaction для их завершения." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -111884,9 +114406,10 @@ index 52ba58b..eaacef7 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2405,86 +2536,89 @@ msgstr "" - "\n" - "Пакеты пропущены из-за проблем с зависимостями:" +-msgstr "" +-"\n" +-"Пакеты пропущены из-за проблем с зависимостями:" ++msgstr "\nПакеты пропущены из-за проблем с зависимостями:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -111942,7 +114465,7 @@ index 52ba58b..eaacef7 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s должен был быть установлен, но не был установлен!" @@ -111953,24 +114476,22 @@ index 52ba58b..eaacef7 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s должен был быть удален, но не был удален!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Невозможно открыть блокировку %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Невозможно открыть блокировку %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Невозможно проверить активен ли процесс %s" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Невозможно проверить активен ли процесс %s" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -111980,38 +114501,52 @@ index 52ba58b..eaacef7 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Вы не можете создать блокировку %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Невозможно открыть блокировку %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Невозможно проверить активен ли процесс %s" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2493,40 +2627,29 @@ msgstr "" - "Пакет не соответствует предложенному для загрузки.\r\n" - "Предлагается запустить run yum --enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Пакет не соответствует предложенному для загрузки.\r\n" +-"Предлагается запустить run yum --enablerepo=%s clean metadata" ++msgstr "Пакет не соответствует предложенному для загрузки.\r\nПредлагается запустить run yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Невозможно проверить контрольную сумму" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Пакет не совпадает с контрольной суммой" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "проверка контрольной суммы неудачна, но кэширование включено для %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "использование локальной копии %s" @@ -112028,311 +114563,316 @@ index 52ba58b..eaacef7 100644 -" * необходимо %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Заголовок не полный." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2534,62 +2657,65 @@ msgstr "" - "Заголовок не в локальном кэше. Включен режим только из кэша. Невозможно " - "загрузить %s" +-msgstr "" +-"Заголовок не в локальном кэше. Включен режим только из кэша. Невозможно " +-"загрузить %s" ++msgstr "Заголовок не в локальном кэше. Включен режим только из кэша. Невозможно загрузить %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Публичный ключ для %s не установлен" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Проблема открытия пакета %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Публичный ключ для %s не заслуживает доверия" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Пакет %s не подписан" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Невозможно удалить %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s удален(ы)" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Невозможно удалить %s файл %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s файл %s удален" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s файлы удалены" +msgid "%d %s file removed" +msgid_plural "%d %s files removed" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "%d %s файл удален" ++msgstr[1] "%d %s файла удалены" ++msgstr[2] "%d %s файлов удалены" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Более одного идентичных совпадений найдено в наборе для %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Совпадений не найдено %s.%s %s:%s-%s из обновлений" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2597,56 +2723,59 @@ msgstr "" - "searchPackages() будет убрано в следующей версии Yum." - " Используйте searchGenerator() взамен. \n" +-msgstr "" +-"searchPackages() будет убрано в следующей версии Yum." +-" Используйте searchGenerator() взамен. \n" ++msgstr "searchPackages() будет убрано в следующей версии Yum. Используйте searchGenerator() взамен. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Поиск %d пакетов" +msgid "Searching %d package" +msgid_plural "Searching %d packages" -+msgstr[0] "" -+msgstr[1] "" -+msgstr[2] "" ++msgstr[0] "Поиск %d пакета" ++msgstr[1] "Поиск %d пакетов" ++msgstr[2] "Поиск %d пакетов" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "поиск пакета %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "поиск среди файлов" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "поиск по содержимому" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Для настроенных репозиториев данных коллекций нет" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Коллекции с названием %s не существует" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "пакет %s не отмечен в коллекции %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Добавление пакета %s из коллекции %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Пакет с именем %s не доступен для установки" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Предупреждение: Группа %s не имеет никаких пакетов." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." - msgstr "" -@@ -2655,147 +2784,154 @@ msgstr "" +-msgstr "" +-"Коллекция %s действительно содержит %u условных пакетов, и возможна их " +-"установка." ++msgstr "Коллекция %s действительно содержит %u условных пакетов, и возможна их установка." #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Кортеж пакетов %s не найден в наборе пакетов" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Кортеж пакетов %s не найден в базе RPM" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Неверный флаг версии от: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Пакет %s не найден" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Package Object не является экземпляром объекта пакета" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Ничего не отмечено для установки" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Проверка виртуального провайдера или файлового провайдера для %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Совпадений с %s не найдено." -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Пакет %s уже установлен и недоступен" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Нет доступных для установки пакетов" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Пакет: %s — уже в списке к действию" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Пакет %s недействителен из-за установленного %s" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " "requirements" - msgstr "Пакет %s заменен %s, но последний не отвечает зависимостям" +-msgstr "Пакет %s заменен %s, но последний не отвечает зависимостям" ++msgstr "Пакет %s заменён %s, но последний не отвечает зависимостям" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Пакет %s недействителен из-за %s, попытка установки %s взамен" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Пакет %s уже установлен, и это последняя версия." -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Пакет %s уже установлен. Проверка обновлений." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Полное обновление" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Устаревший и уже необновляемый пакет: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" -+msgstr "" ++msgstr "Ни один пакет не отмечен для обновления: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Пакет уже устарел: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Устаревший необновляемый пакет: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Необновленный пакет, который был обновлен ранее: %s.%s %s:%s-%s" @@ -112340,393 +114880,406 @@ index 52ba58b..eaacef7 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Нет пакетов для удаления" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" -+msgstr "" ++msgstr "Ни один пакет не отмечен для удаления: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Пропуск выполняющегося ядра: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Исключение %s из списка действий" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Невозможно открыть: %s. Пропуск." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Проверка %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Нельзя произвести localinstall deltarpm %s. Пропуск." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2803,12 +2939,12 @@ msgstr "" - "Невозможно добавить пакет %s в список действий. Несовместимая архитектура: " - "%s" +-msgstr "" +-"Невозможно добавить пакет %s в список действий. Несовместимая архитектура: " +-"%s" ++msgstr "Невозможно добавить пакет %s в список действий. Несовместимая архитектура: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "Установка пакета %s невозможна. Его заменил установленный пакет %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2817,7 +2953,7 @@ msgstr "" - "Пакет %s не установлен, невозможно обновить его. Запустите yum install для " - "его установки." + "instead." +-msgstr "" +-"Пакет %s не установлен, невозможно обновить его. Запустите yum install для " +-"его установки." ++msgstr "Пакет %s не установлен, невозможно обновить его. Запустите yum install для его установки." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2826,138 +2962,138 @@ msgstr "" - "Пакет %s.%s не установлен, не возможно его обновить. Запустите yum install " - "чтобы установить вместо него." + " instead." +-msgstr "" +-"Пакет %s.%s не установлен, не возможно его обновить. Запустите yum install " +-"чтобы установить вместо него." ++msgstr "Пакет %s.%s не установлен, не возможно его обновить. Запустите yum install чтобы установить вместо него." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Исключаем %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s отмечен для установки" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "%s отмечен как обновление для %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: не обновляет установленный пакет." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Невозможно открыть файл %s. Пропуск." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Проблема при переустановке: не найден пакет для удаления" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Проблема при переустановке: пакет %s не найден для установки" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Пакеты для отката версии отсутствуют" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Пакет %s может быть повторно установлен, пропуск" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Пакеты недоступны: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Только переход к следующей версии доступен для пакета: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Ошибка отката версии: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" -+msgstr "" ++msgstr "Не удалось обновить: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Получение ключа из %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Неудача получения ключа GPG:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" - "Подпись GPG ключа на ключе %s не совпадает с CA ключом для репозитория: %s" +-msgstr "" +-"Подпись GPG ключа на ключе %s не совпадает с CA ключом для репозитория: %s" ++msgstr "Подпись GPG ключа на ключе %s не совпадает с CA ключом для репозитория: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "Подпись GPG ключа проверена через CA ключ(и)" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Неверный GPG ключ %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Ошибка обработки GPG ключа: ключ не имеет значения %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" Package : %s (%s)\n" -+" From : %s" - msgstr "" +-msgstr "" -"Импорт %s ключа 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" Package : %s (%s)\n" ++" From : %s" ++msgstr "Импорт %s ключа 0x%s:\n Владелец : \"%s\"\n Отпечаток : %s\n Пакет : %s (%s)\n Источник : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" -+" Userid : \"%s\"\n" -+" Fingerprint: %s\n" -+" From : %s" - msgstr "" +-msgstr "" -"Импорт %s ключа 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" ++" Userid : \"%s\"\n" ++" Fingerprint: %s\n" ++" From : %s" ++msgstr "Импорт %s ключа 0x%s:\n Владелец : \"%s\"\n Отпечаток : %s\n Источник : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG ключ %s (0x%s) уже установлен" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Неудача импорта ключа (code %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Импорт ключа успешно завершен" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Не установлены какие-либо ключи" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2966,25 +3102,25 @@ msgstr "" - "GPG ключи включены для репозитория \"%s\", но они не является правильными для данного пакета.\n" - "Пожалуйста, проверьте правильно ли настроены URL ключей для данного репозитория." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG ключи включены для репозитория \"%s\", но они не является правильными для данного пакета.\n" +-"Пожалуйста, проверьте правильно ли настроены URL ключей для данного репозитория." ++msgstr "GPG ключи включены для репозитория \"%s\", но они не является правильными для данного пакета.\nПожалуйста, проверьте правильно ли настроены URL ключей для данного репозитория." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Импорт ключа(ключей) не помог, неверный ключ(ключи)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG ключ из %s (0x%s) уже был импортирован" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Импорт ключа неудачен" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Не установлены какие-либо ключи для репозитория %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2994,157 +3130,181 @@ msgstr "" - "\r\n" - "Убедитесь в правильности заданных URL с ключами для этого источника." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Ключи подписей GPG для источника «%s» уже установлены, но они неверные.\n" +-"\r\n" +-"Убедитесь в правильности заданных URL с ключами для этого источника." ++msgstr "Ключи подписей GPG для источника «%s» уже установлены, но они неверные.\n\r\nУбедитесь в правильности заданных URL с ключами для этого источника." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Не удается найти подходящее зеркало" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Были обнаружены ошибки во время загрузки пакетов." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Пожалуйста, сообщите об этой ошибке в %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Ошибки проверки сценария:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Невозможно задать кэш-папку: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "Зависимости не определены. Действие не будет сохранено." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Не удалось сохранить файл сценария %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Не удалось прочесть сохранённый сценарий %s : %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "Версия базы данных RPM не совпала с версией сценария," -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " игнорирование, как потребуется" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " прерывание" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "tsflags не найдены или не целочисленные." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Найден txmbr в неопределенном состоянии: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Не найден txmbr: %s в состоянии %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Не найден txmbr: %s %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Отсутствует часть сценария, нарушены связи, или сценарий изменился," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " пропущено по требованию. Проверьте зависимости!" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -112802,7 +115355,8 @@ index 52ba58b..eaacef7 100644 -#: ../yum/rpmsack.py:148 +#: ../yum/rpmsack.py:159 msgid "has missing requires of" - msgstr "имеет недостающие зависимости от" +-msgstr "имеет недостающие зависимости от" ++msgstr "требует недостающего" -#: ../yum/rpmsack.py:151 +#: ../yum/rpmsack.py:162 @@ -112819,33 +115373,52 @@ index 52ba58b..eaacef7 100644 +#: ../yum/rpmsack.py:179 #, python-format msgid "%s is obsoleted by %s" - msgstr "%s заменен на %s" +-msgstr "%s заменен на %s" ++msgstr "%s заменён на %s" -#: ../yum/rpmsack.py:176 +#: ../yum/rpmsack.py:187 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s предоставляет %s, но он не найден" -@@ -3153,6 +3313,17 @@ msgstr "%s предоставляет %s, но он не найден" +@@ -3153,6 +3217,19 @@ msgstr "%s предоставляет %s, но он не найден" msgid "Repackaging" msgstr "Переупаковка" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Проверить: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Недостаточно места в директории %s\n" -+" * свободно %s\n" -+" * необходимо %s" ++msgstr "Недостаточно места в директории %s\n * свободно %s\n * необходимо %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3165,8 +3242,7 @@ msgstr "Контрольная сумма md5 пакета %s не совпад + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Невозможно открыть базу RPM для чтения. Возможно база уже используется." ++msgstr "Невозможно открыть базу RPM для чтения. Возможно база уже используется." + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3182,5 +3258,3 @@ msgstr "Поврежденный заголовок %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Невозможно открыть пакет %s — ошибка %s" +- +- diff --git a/po/sr.po b/po/sr.po -index 351d6db..455d099 100644 +index 351d6db..29dba40 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,13 +2,14 @@ @@ -112856,22 +115429,23 @@ index 351d6db..455d099 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,122 +17,125 @@ msgstr "" +@@ -16,865 +17,893 @@ msgstr "" "Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Ажурирам" @@ -112882,31 +115456,31 @@ index 351d6db..455d099 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Инсталирам" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Превазиђени" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Ажурирани" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Обрисани" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Инсталирани" @@ -112933,7 +115507,7 @@ index 351d6db..455d099 100644 msgstr "Обрисано: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Уклањам" @@ -112943,69 +115517,69 @@ index 351d6db..455d099 100644 msgstr "Чишћење" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Наредба „%s“ је већ дефинисана" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Постављам ризнице" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Читам метаподатке ризница из локалних датотека" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Грешка при подешавању: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Грешка у опцијама: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Инсталиран : %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Направио/ла: %s %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Објавио/ла : %s %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Морате да унесете неку команду" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Захтеви диска:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -113017,102 +115591,104 @@ index 351d6db..455d099 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -139,60 +143,60 @@ msgstr "" - "Сажетак грешака\n" - "-------------\n" +-msgstr "" +-"Сажетак грешака\n" +-"-------------\n" ++msgstr "Сажетак грешака\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Покушавам да извршим трансакцију али нема шта да се ради. Излазим." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Излазим на команду корисника" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Преузимам пакете:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Грешка при преузимању пакета:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Пријавите ову грешку у %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Извршавам проверу трансакције" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Грешка при провери трансакције:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Провера трансакције је успела" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Извршавам трансакцију" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -200,236 +204,267 @@ msgstr "" - "Одбијам да аутоматски увезем кључеве када се извршавање не надгледа.\n" - "За превазилажење овога користите „-y“." +-msgstr "" +-"Одбијам да аутоматски увезем кључеве када се извршавање не надгледа.\n" +-"За превазилажење овога користите „-y“." ++msgstr "Одбијам да аутоматски увезем кључеве када се извршавање не надгледа.\nЗа превазилажење овога користите „-y“." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Можда сте мислили: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "%s%s%s пакет је доступан, али није инсталиран." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Не постоји доступан пакет %s%s%s." @@ -113120,7 +115696,7 @@ index 351d6db..455d099 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Пакет(и) који ће се инсталирати" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -113130,13 +115706,13 @@ index 351d6db..455d099 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Нема шта да се ради" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d пакети означени за ажурирање" @@ -113147,12 +115723,12 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Нема пакета означених за ажурирање" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -113163,12 +115739,12 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d пакети означени за уклањање" @@ -113179,14 +115755,14 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Нема пакета означених за уклањање" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Пакет(и) који ће се уназадити" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -113195,13 +115771,13 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -113209,7 +115785,7 @@ index 351d6db..455d099 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Пакет(и) који ће се поново инсталирати" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -113218,152 +115794,153 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Ниједан пакет није добављен" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Пакет(и) који ће се инсталирати" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Упозорење: није нађено подударање за %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Нису пронађена подударања" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Нису пронађени пакети за %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Чистим све" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Чистим заглавља" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Чистим пакете" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Чистим xml метаподатке" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Чистим кеш базе података" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Чистим expire-cache метаподатке" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Чистим додатке" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Инсталиране групе:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Доступне групе:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Урађено" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Упозорење: група %s не постоји." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама" +-msgstr "" +-"Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама" ++msgstr "Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d пакет(и) за инсталацију" @@ -113374,18 +115951,18 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Не постоји група под именом %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Нема пакета за уклањање из група" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d пакет(и) за уклањање" @@ -113396,944 +115973,952 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Пакет %s је већ инсталиран, прескачем га" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Уклањам неупоредив пакет %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Не постоји инсталиран други %s, додајем га у списак за потенцијалну " - "инсталацију" +-msgstr "" +-"Не постоји инсталиран други %s, додајем га у списак за потенцијалну " +-"инсталацију" ++msgstr "Не постоји инсталиран други %s, додајем га у списак за потенцијалну инсталацију" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Опције додатка" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Грешка командне линије: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -440,285 +475,289 @@ msgstr "" "\n" - "%s: %s опција захтева аргумент" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s опција захтева аргумент" ++msgstr "\n\n%s: %s опција захтева аргумент" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color прима један од следећих: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "прикажи ову помоћну поруку и изађи" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "буди толерантан на грешке" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "место датотеке подешавања" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "најдуже време чекања на команду" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "ниво излазног приказа за проналажење грешака" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" - msgstr "" - "приказуј дупликате, у ризницама, у командама за излиставање/претраживање" +-msgstr "" +-"приказуј дупликате, у ризницама, у командама за излиставање/претраживање" ++msgstr "приказуј дупликате, у ризницама, у командама за излиставање/претраживање" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "ниво излазног приказа грешака" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "тиха радња" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "опширна радња" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "одговори са да на сва питања" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "прикажи Yum верзију и изађи" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "постави корени директоријум инсталације" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "укључи једну или више ризница (скраћенице су дозвољене)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "искључи једну или више ризница (скраћенице су дозвољене)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "изузми пакет(е) по имену или глобу" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "искључи изузимање из главног скупа, за ризницу или за све" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "укључи обраду застарелих пакета у току ажурирања" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "искључи додатке за Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "искључи проверу gpg потписа" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "искључи додатке по имену" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "укључи додатке по имену" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "прескочи пакете који имају проблема са решавањем зависности" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "контролише да ли се користи боја" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "јан" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "феб" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "мар" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "апр" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "мај" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "јун" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "јул" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "авг" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "сеп" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "окт" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "нов" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "дец" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Покушавам други одраз." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Ризница : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "УРЛ : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Опис : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "d" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "da" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ne" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Да ли је ово у реду [d/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -727,154 +766,157 @@ msgstr "" - "\n" - "Група: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Група: %s" ++msgstr "\nГрупа: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " ИБ групе: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Опис: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Обавезни пакети:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Подразумевани пакети:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Изборни пакети:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Условљени пакети:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "пакет: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Не постоје зависности овог пакета" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " зависност: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Незадовољена зависност" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Повезан из :" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Лиценца : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Име датотеке: %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Остало : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Догодила се грешка при рачунању укупне величине за преузимање" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Укупна величина: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Укупна величина за преузимање: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Инсталирам због зависности" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Ажурирам због зависности" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Уклањам због зависности" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Прескочено (проблеми са зависностима)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Пакет" +msgid_plural "Packages" -+msgstr[0] "Пакет" ++msgstr[0] "" +msgstr[1] "" -+msgstr[2] "" ++msgstr[2] "Пакет" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Архитектура" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Верзија" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Ризница" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Величина" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -882,57 +924,59 @@ msgid "" +@@ -882,57 +911,59 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Уклоњено" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Зависност уклоњена" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Зависност инсталирана" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Зависност ажурирана" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Замењено" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Неуспех" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "два" -@@ -940,7 +984,7 @@ msgstr "два" +@@ -940,7 +971,7 @@ msgstr "два" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -948,471 +992,523 @@ msgid "" +@@ -948,491 +979,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "прекид од стране корисника" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Укупно" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -114342,17 +116927,17 @@ index 351d6db..455d099 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -114365,224 +116950,224 @@ index 351d6db..455d099 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "инсталиран" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "обрисан" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "ажуриран" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "превазиђен" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Извршава се провера трансакције" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Поновно покретање разрешавања зависности са новим променама." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Завршено је разрешавање зависности" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Обрађујем зависност: %s за пакет: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Неразрешена зависност: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -114590,7 +117175,7 @@ index 351d6db..455d099 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -114598,7 +117183,7 @@ index 351d6db..455d099 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -114606,7 +117191,7 @@ index 351d6db..455d099 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -114614,44 +117199,51 @@ index 351d6db..455d099 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Сукоб при обради: %s се сукоби са %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте." +-msgstr "" +-"--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте." ++msgstr "--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Преузимам заглавље за %s ради паковања у скуп трансакције." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Извршава се" @@ -114677,7 +117269,7 @@ index 351d6db..455d099 100644 msgstr "Праћен/заустављен" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Непознат" @@ -114715,25 +117307,31 @@ index 351d6db..455d099 100644 msgid "" "\n" "\n" -@@ -1422,7 +1518,7 @@ msgstr "" - "\n" - "Излазим када корисник откаже" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Излазим када корисник откаже" ++msgstr "\n\nИзлазим када корисник откаже" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1432,7 +1528,7 @@ msgstr "" - "\n" - "Излазим када се сломи цев" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Излазим када се сломи цев" ++msgstr "\n\nИзлазим када се сломи цев" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1440,42 +1536,42 @@ msgid "" +@@ -1440,50 +1522,47 @@ msgid "" "%s" msgstr "" @@ -114765,8 +117363,9 @@ index 351d6db..455d099 100644 -#: ../utils.py:346 ../yummain.py:194 +#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" - msgstr "" - " Можете да пробате употребу --skip-broken опције ради заобилажења проблема" +-msgstr "" +-" Можете да пробате употребу --skip-broken опције ради заобилажења проблема" ++msgstr " Можете да пробате употребу --skip-broken опције ради заобилажења проблема" -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 @@ -114784,16 +117383,17 @@ index 351d6db..455d099 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1483,7 +1579,7 @@ msgstr "" - "\n" - "Зависности су разрешене" +-msgstr "" +-"\n" +-"Зависности су разрешене" ++msgstr "\nЗависности су разрешене" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Завршено!" -@@ -1495,7 +1591,7 @@ msgstr "" +@@ -1495,7 +1574,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Морате бити root корисник да бисте извршили ову команду." @@ -114802,9 +117402,25 @@ index 351d6db..455d099 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1525,362 +1621,351 @@ msgstr "" +@@ -1510,475 +1589,482 @@ msgid "" + "will install it for you.\n" "\n" - "За више информација контактирајте добављача ваше дистрибуције или пакета.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Укључили сте проверу пакета помоћу GPG кључева. Ово је добра ствар. \n" +-"Међутим, немате инсталиран ниједан GPG јавни кључ. Морате да преузмете\n" +-"кључеве за пакете које желите да инсталирате и инсталирате их.\n" +-"То можете урадити извршавањем команде:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Такође, можете одредити урл за кључ који желите да користите\n" +-"за ризницу у „gpgkey“ опцији у одељку везаним за ризнице и yum \n" +-"ће га инсталирати за вас.\n" +-"\n" +-"За више информација контактирајте добављача ваше дистрибуције или пакета.\n" ++msgstr "\nУкључили сте проверу пакета помоћу GPG кључева. Ово је добра ствар. \nМеђутим, немате инсталиран ниједан GPG јавни кључ. Морате да преузмете\nкључеве за пакете које желите да инсталирате и инсталирате их.\nТо можете урадити извршавањем команде:\n rpm --import public.gpg.key\n\n\nТакође, можете одредити урл за кључ који желите да користите\nза ризницу у „gpgkey“ опцији у одељку везаним за ризнице и yum \nће га инсталирати за вас.\n\nЗа више информација контактирајте добављача ваше дистрибуције или пакета.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -114855,15 +117471,17 @@ index 351d6db..455d099 100644 +#: ../yumcommands.py:167 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "" - "Не постоји датотека %s, која је прослеђена као аргумент командном окружењу." +-msgstr "" +-"Не постоји датотека %s, која је прослеђена као аргумент командном окружењу." ++msgstr "Не постоји датотека %s, која је прослеђена као аргумент командном окружењу." -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 msgid "Error: more than one file given as argument to shell." - msgstr "" - "Грешка: више од једне датотеке је прослеђено као аргумент командном " - "окружењу." +-msgstr "" +-"Грешка: више од једне датотеке је прослеђено као аргумент командном " +-"окружењу." ++msgstr "Грешка: више од једне датотеке је прослеђено као аргумент командном окружењу." -#: ../yumcommands.py:148 +#: ../yumcommands.py:192 @@ -115103,335 +117721,340 @@ index 351d6db..455d099 100644 msgstr "Прикажи подешене софтверске ризнице" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "укључена" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "искључена" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Ревизија ризнице : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Дистро ознаке ризнице: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Металинк ризнице : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Ажурирано : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "репо id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "статус" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "репо име" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Прикажи корисну поруку о употреби" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Није доступна помоћ за %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1890,7 +1975,7 @@ msgstr "" - "\n" - "псеудоними: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"псеудоними: " ++msgstr "\n\nпсеудоними: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1900,85 +1985,125 @@ msgstr "" - "\n" - "псеудоним: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"псеудоним: " ++msgstr "\n\nпсеудоним: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Постављам процес поновне инсталације" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "поновно инсталирам пакет" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Постављам процес уназађивања" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "уназади пакет" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1989,28 +2114,34 @@ msgstr "" +@@ -1989,105 +2075,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." msgstr "" - "Неки други програм тренутно држи yum закључаним; чекам да тај програм " - "изађе..." +-"Неки други програм тренутно држи yum закључаним; чекам да тај програм " +-"изађе..." -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Неки други програм тренутно држи yum закључаним; чекам да тај програм изађе..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -115452,276 +118075,281 @@ index 351d6db..455d099 100644 msgid "" "\n" "\n" -@@ -2020,74 +2151,74 @@ msgstr "" - "\n" - "Излазим када корисник откаже." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Излазим када корисник откаже." ++msgstr "\n\nИзлазим када корисник откаже." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() неће бити присутна у будућим верзијама Yum-а.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Постављам TransactionSets пре него што се подигне класа подешавања" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Погрешан tsflag у датотеци подешавања: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Претражујем pkgSack за зависност: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Члан: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s пребачен за инсталацију" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Додајем пакет %s у начину рада %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Уклањам пакет %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s захтева: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Потребан захтев је већ потражен, обмањујем" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Потребан захтев није име пакета. Тражим: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Могући снабдевач: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Режим је %s за снабдевача %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Режим за пакет који снабдева %s: %s" -@@ -2095,114 +2226,114 @@ msgstr "Режим за пакет који снабдева %s: %s" +@@ -2095,1017 +2182,1031 @@ msgstr "Режим за пакет који снабдева %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s пакет захтева да %s буде означен за брисање" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: мењам %s са %s ради разрешавања зависности." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: ажурирам %s ради разрешавања зависности." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Не могу да пронађем путању ажурирања за зависност за: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Брзо повезивање пакета %s као захтева за %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s је у пруженим пакетима али је већ инсталиран, уклањам га." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Потенцијално разрешавање пакета %s има новији примерак у ts-у." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Потенцијално разрешавање пакета %s има инсталиран новији примерак." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s је већ у ts-у, прескачем га" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: означавам %s као ажурирање за %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: означавам %s као инсталацију за %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Успех - празна трансакција" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Поново покрећем петљу" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Завршетак процеса зависности" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Успех - зависности су разрешене" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Проверавам зависности за %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "тражим %s као захтев за %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Покрећем compare_providers() за %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "боља архитектура у пакету %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s превазилази %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2211,142 +2342,142 @@ msgstr "" - "archdist упоредио %s са %s на %s\n" - " Победник: %s" + " Winner: %s" +-msgstr "" +-"archdist упоредио %s са %s на %s\n" +-" Победник: %s" ++msgstr "archdist упоредио %s са %s на %s\n Победник: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "заједнички изворни rpm %s и %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "заједнички префикс %s између %s и %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Најбољи редослед: %s" @@ -115854,9 +118482,10 @@ index 351d6db..455d099 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2354,21 +2485,21 @@ msgstr "" - "Остале су недовршене трансакције. Можда би прво требало да извршите yum-" - "complete-transaction да бисте их завршили." +-msgstr "" +-"Остале су недовршене трансакције. Можда би прво требало да извршите yum-" +-"complete-transaction да бисте их завршили." ++msgstr "Остале су недовршене трансакције. Можда би прво требало да извршите yum-complete-transaction да бисте их завршили." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -115880,9 +118509,10 @@ index 351d6db..455d099 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2376,130 +2507,122 @@ msgstr "" - "\n" - "Пакети су прескочени због проблема са зависностима:" +-msgstr "" +-"\n" +-"Пакети су прескочени због проблема са зависностима:" ++msgstr "\nПакети су прескочени због проблема са зависностима:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -115916,9 +118546,10 @@ index 351d6db..455d099 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Упозорење: дошло је до грешке у скриптици или неке друге некритичне грешке " - "током трансакције." +-msgstr "" +-"Упозорење: дошло је до грешке у скриптици или неке друге некритичне грешке " +-"током трансакције." ++msgstr "Упозорење: дошло је до грешке у скриптици или неке друге некритичне грешке током трансакције." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -115940,7 +118571,7 @@ index 351d6db..455d099 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -115951,24 +118582,22 @@ index 351d6db..455d099 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Нисам у могућности да проверим да ли је PID %s активан" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Нисам у могућности да проверим да ли је PID %s активан" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -115978,13 +118607,25 @@ index 351d6db..455d099 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Нисам у могућности да проверим да ли је PID %s активан" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -115992,25 +118633,26 @@ index 351d6db..455d099 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Не могу да извршим контролу суме" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Пакет нема одговарајући контролну суму" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "пакет нема одговарајућу вредност контролне суме или је за %s укључено " - "кеширање" +-msgstr "" +-"пакет нема одговарајућу вредност контролне суме или је за %s укључено " +-"кеширање" ++msgstr "пакет нема одговарајућу вредност контролне суме или је за %s укључено кеширање" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "користим локални %s умножак" @@ -116027,69 +118669,70 @@ index 351d6db..455d099 100644 -" * потребно је %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Заглавље није потпуно." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2507,62 +2630,65 @@ msgstr "" - "Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не " - "могу да преузмем %s" +-msgstr "" +-"Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не " +-"могу да преузмем %s" ++msgstr "Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не могу да преузмем %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Јавни кључ за %s није инсталиран" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Проблем са отварањем пакета %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Јавни кључ за %s није поверљив" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Пакет %s није потписан" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Не могу да уклоним %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s је уклоњен" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Не могу да уклоним %s датотеку %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s датотека %s је уклоњена" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s датотеке су уклоњене" @@ -116100,28 +118743,29 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Постоји више од једног идентичног слагања у групи за %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ништа се не слаже са %s.%s %s:%s-%s из ажурирања" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2570,216 +2696,226 @@ msgstr "" - "searchPackages() неће бити присутна у будућим Yum верзијама." - " Уместо ње користите searchGenerator(). \n" +-msgstr "" +-"searchPackages() неће бити присутна у будућим Yum верзијама." +-" Уместо ње користите searchGenerator(). \n" ++msgstr "searchPackages() неће бити присутна у будућим Yum верзијама. Уместо ње користите searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Претражујем %d пакете" @@ -116132,62 +118776,62 @@ index 351d6db..455d099 100644 +msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "тражим пакет %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "тражим у уносима датотека" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "тражим у уносима достављача" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Нема доступних података о групама за подешене ризнице" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Не постоји група под именом %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "пакет %s није означен у групи %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Додајем пакет %s из групе %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Ниједан пакет под именом %s није доступан за инсталацију" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -116195,79 +118839,79 @@ index 351d6db..455d099 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Група пакета %s није нађена у packagesack-у" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Нема пронађених пакета за %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Објекат пакета није био примерак објекта пакета" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Није одређено ништа за инсталацију" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Проверавам виртуелну доставу или доставу датотеке за %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Не постоји слагање за аргумент: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Пакет %s је инсталиран и није доступан" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Нема пакета доступних за инсталацију" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Пакет: %s - већ је у скупу трансакције" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -116275,63 +118919,64 @@ index 351d6db..455d099 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Већ је инсталирана најновија верзија пакета %s" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Пакет који се поклапа са %s је већ инсталиран. Проверавам за новију верзију." +-msgstr "" +-"Пакет који се поклапа са %s је већ инсталиран. Проверавам за новију верзију." ++msgstr "Пакет који се поклапа са %s је већ инсталиран. Проверавам за новију верзију." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Ажурирам све" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Не ажурирам пакете који су већ превазиђени: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Пакет је већ превазиђен: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Не ажурирам пакете који су већ ажурирани: %s.%s %s:%s-%s" @@ -116339,66 +118984,69 @@ index 351d6db..455d099 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Ниједан пакет није одређен за уклањање" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Испитујем %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Не могу да додам пакет %s у трансакцију. Архитектура није усаглашена: %s" +-msgstr "" +-"Не могу да додам пакет %s у трансакцију. Архитектура није усаглашена: %s" ++msgstr "Не могу да додам пакет %s у трансакцију. Архитектура није усаглашена: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2788,138 +2924,145 @@ msgstr "" - "Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију " - "да бисте га инсталирали." + "instead." +-msgstr "" +-"Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију " +-"да бисте га инсталирали." ++msgstr "Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију да бисте га инсталирали." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -116406,119 +119054,120 @@ index 351d6db..455d099 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Изузимам %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Означавам %s за инсталацију" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Означавам %s као ажурирање за %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: не ажурира инсталирани пакет." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Не могу да отворим датотеку: %s. Прескачем је." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање" +-msgstr "" +-"Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање" ++msgstr "Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Нема пакета доступних за уназађивање" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Пакету %s су дозвољене многоструке инсталације, прескачем га" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Нема доступног одговарајућег пакета: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Само је надградња доступна за пакет: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Добављање GPG кључа није успело: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Рашчлањивање GPG кључа није успело: кључ нема вредност %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -116532,7 +119181,7 @@ index 351d6db..455d099 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -116544,60 +119193,62 @@ index 351d6db..455d099 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG кључ на %s (0x%s) је већ инсталиран" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Није успео увоз кључа (код %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Кључ је успешно увезен" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2928,184 +3071,208 @@ msgstr "" - "GPG кључеви излистани за „%s“ ризницу су већ инсталирани али нису одговарајући за овај пакет.\n" - "Проверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG кључеви излистани за „%s“ ризницу су већ инсталирани али нису одговарајући за овај пакет.\n" +-"Проверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу." ++msgstr "GPG кључеви излистани за „%s“ ризницу су већ инсталирани али нису одговарајући за овај пакет.\nПроверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Увоз кључа(кључева) није помогао, погрешан кључ(кључеви)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG кључ на %s (0x%s) је већ увезен" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Није успео увоз кључа" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -116605,117 +119256,117 @@ index 351d6db..455d099 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Не могу да пронађем одговарајући одраз." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Појавиле су се грешке за време преузимања пакета." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Пријавите ову грешку код %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Грешке при провери трансакције: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -116767,9 +119418,10 @@ index 351d6db..455d099 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "У путањи за претраживање додатака постоје два или више додатака под именом " - "„%s“" +-msgstr "" +-"У путањи за претраживање додатака постоје два или више додатака под именом " +-"„%s“" ++msgstr "У путањи за претраживање додатака постоје два или више додатака под именом „%s“" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -116817,26 +119469,45 @@ index 351d6db..455d099 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3114,6 +3281,17 @@ msgstr "" +@@ -3114,6 +3215,19 @@ msgstr "" msgid "Repackaging" msgstr "Поновно паковање" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Недовољна количина простора у директоријуму %s за преузимање\n" -+" * слободно је %s\n" -+" * потребно је %s" ++msgstr "Недовољна количина простора у директоријуму %s за преузимање\n * слободно је %s\n * потребно је %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3126,9 +3240,7 @@ msgstr "Није успела md5 провера за %s RPM" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Не могу да отворим RPM базу података за потребе читања. Можда је већ у " +-"употреби?" ++msgstr "Не могу да отворим RPM базу података за потребе читања. Можда је већ у употреби?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3144,5 +3256,3 @@ msgstr "Оштећено заглавље %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Грешка при отварању rpm-а %s - грешка %s" +- +- diff --git a/po/sr@latin.po b/po/sr@latin.po -index 2576fa8..cd9da35 100644 +index 2576fa8..1543e1e 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -2,13 +2,14 @@ @@ -116847,22 +119518,23 @@ index 2576fa8..cd9da35 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,122 +17,125 @@ msgstr "" +@@ -16,866 +17,893 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Ažuriram" @@ -116873,31 +119545,31 @@ index 2576fa8..cd9da35 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Instaliram" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Prevaziđeni" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Ažurirani" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Obrisani" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Instalirani" @@ -116924,7 +119596,7 @@ index 2576fa8..cd9da35 100644 msgstr "Obrisano: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Uklanjam" @@ -116934,69 +119606,69 @@ index 2576fa8..cd9da35 100644 msgstr "Čišćenje" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Naredba „%s“ je već definisana" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Postavljam riznice" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Čitam metapodatke riznica iz lokalnih datoteka" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Greška pri podešavanju: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Greška u opcijama: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Instaliran : %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Napravio/la: %s %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Objavio/la : %s %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Morate da unesete neku komandu" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Zahtevi diska:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -117008,102 +119680,104 @@ index 2576fa8..cd9da35 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -139,60 +143,60 @@ msgstr "" - "Sažetak grešaka\n" - "-------------\n" +-msgstr "" +-"Sažetak grešaka\n" +-"-------------\n" ++msgstr "Sažetak grešaka\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Pokušavam da izvršim transakciju ali nema šta da se radi. Izlazim." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Izlazim na komandu korisnika" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Preuzimam pakete:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Greška pri preuzimanju paketa:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Prijavite ovu grešku u %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Izvršavam proveru transakcije" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Greška pri proveri transakcije:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Provera transakcije je uspela" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Izvršavam transakciju" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -200,237 +204,268 @@ msgstr "" - "Odbijam da automatski uvezem ključeve kada se izvršavanje ne nadgleda.\n" - "Za prevazilaženje ovoga koristite „-y“." +-msgstr "" +-"Odbijam da automatski uvezem ključeve kada se izvršavanje ne nadgleda.\n" +-"Za prevazilaženje ovoga koristite „-y“." ++msgstr "Odbijam da automatski uvezem ključeve kada se izvršavanje ne nadgleda.\nZa prevazilaženje ovoga koristite „-y“." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Možda ste mislili: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "%s%s%s paket je dostupan, ali nije instaliran." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Ne postoji dostupan paket %s%s%s." @@ -117111,7 +119785,7 @@ index 2576fa8..cd9da35 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket(i) koji će se instalirati" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -117121,13 +119795,13 @@ index 2576fa8..cd9da35 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Nema šta da se radi" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paketi označeni za ažuriranje" @@ -117138,12 +119812,12 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Nema paketa označenih za ažuriranje" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -117154,12 +119828,12 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paketi označeni za uklanjanje" @@ -117170,14 +119844,14 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Nema paketa označenih za uklanjanje" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paket(i) koji će se unazaditi" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -117186,13 +119860,13 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -117200,7 +119874,7 @@ index 2576fa8..cd9da35 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket(i) koji će se ponovo instalirati" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -117209,153 +119883,154 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Nijedan paket nije dobavljen" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paket(i) koji će se instalirati" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Upozorenje: nije nađeno podudaranje za %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Nisu pronađena podudaranja" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Nisu pronađeni paketi za %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Čistim sve" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Čistim zaglavlja" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Čistim pakete" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Čistim xml metapodatke" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Čistim keš baze podataka" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Čistim expire-cache metapodatke" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Čistim dodatke" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Instalirane grupe:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Dostupne grupe:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Urađeno" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Upozorenje: grupa %s ne postoji." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Nema dostupnih paketa za instalaciju ili ažuriranje u svim zahtevanim " - "grupama" +-msgstr "" +-"Nema dostupnih paketa za instalaciju ili ažuriranje u svim zahtevanim " +-"grupama" ++msgstr "Nema dostupnih paketa za instalaciju ili ažuriranje u svim zahtevanim grupama" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paket(i) za instalaciju" @@ -117366,18 +120041,18 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Ne postoji grupa pod imenom %s" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Nema paketa za uklanjanje iz grupa" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paket(i) za uklanjanje" @@ -117388,944 +120063,952 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s je već instaliran, preskačem ga" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Uklanjam neuporediv paket %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Ne postoji instaliran drugi %s, dodajem ga u spisak za potencijalnu " - "instalaciju" +-msgstr "" +-"Ne postoji instaliran drugi %s, dodajem ga u spisak za potencijalnu " +-"instalaciju" ++msgstr "Ne postoji instaliran drugi %s, dodajem ga u spisak za potencijalnu instalaciju" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Opcije dodatka" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Greška komandne linije: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -441,285 +476,289 @@ msgstr "" "\n" - "%s: %s opcija zahteva argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s opcija zahteva argument" ++msgstr "\n\n%s: %s opcija zahteva argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color prima jedan od sledećih: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "prikaži ovu pomoćnu poruku i izađi" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "budi tolerantan na greške" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "mesto datoteke podešavanja" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "najduže vreme čekanja na komandu" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "nivo izlaznog prikaza za pronalaženje grešaka" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" - msgstr "" - "prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje" +-msgstr "" +-"prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje" ++msgstr "prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "nivo izlaznog prikaza grešaka" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "tiha radnja" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "opširna radnja" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "odgovori sa da na sva pitanja" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "prikaži Yum verziju i izađi" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "postavi koreni direktorijum instalacije" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "uključi jednu ili više riznica (skraćenice su dozvoljene)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "isključi jednu ili više riznica (skraćenice su dozvoljene)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "izuzmi paket(e) po imenu ili globu" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "isključi izuzimanje iz glavnog skupa, za riznicu ili za sve" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "uključi obradu zastarelih paketa u toku ažuriranja" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "isključi dodatke za Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "isključi proveru gpg potpisa" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "isključi dodatke po imenu" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "uključi dodatke po imenu" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "preskoči pakete koji imaju problema sa rešavanjem zavisnosti" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "kontroliše da li se koristi boja" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "maj" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "avg" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "okt" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "dec" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Pokušavam drugi odraz." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Riznica : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Opis : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "d" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "da" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ne" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Da li je ovo u redu [d/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -728,154 +767,157 @@ msgstr "" - "\n" - "Grupa: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grupa: %s" ++msgstr "\nGrupa: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " IB grupe: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Opis: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Obavezni paketi:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Podrazumevani paketi:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Izborni paketi:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Uslovljeni paketi:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paket: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Ne postoje zavisnosti ovog paketa" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " zavisnost: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Nezadovoljena zavisnost" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Povezan iz :" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licenca : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Ime datoteke: %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Ostalo : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Dogodila se greška pri računanju ukupne veličine za preuzimanje" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Ukupna veličina: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Ukupna veličina za preuzimanje: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Instaliram zbog zavisnosti" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Ažuriram zbog zavisnosti" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Uklanjam zbog zavisnosti" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Preskočeno (problemi sa zavisnostima)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" -+msgstr[0] "Paket" ++msgstr[0] "" +msgstr[1] "" -+msgstr[2] "" ++msgstr[2] "Paket" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Arhitektura" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Verzija" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Riznica" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Veličina" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -883,57 +925,59 @@ msgid "" +@@ -883,57 +911,59 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Uklonjeno" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Zavisnost uklonjena" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Zavisnost instalirana" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Zavisnost ažurirana" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Zamenjeno" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Neuspeh" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "dva" -@@ -941,7 +985,7 @@ msgstr "dva" +@@ -941,7 +971,7 @@ msgstr "dva" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -949,471 +993,523 @@ msgid "" +@@ -949,491 +979,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "prekid od strane korisnika" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Ukupno" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -118334,17 +121017,17 @@ index 2576fa8..cd9da35 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -118357,224 +121040,224 @@ index 2576fa8..cd9da35 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "instaliran" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "obrisan" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "ažuriran" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "prevaziđen" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Izvršava se provera transakcije" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Ponovno pokretanje razrešavanja zavisnosti sa novim promenama." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Završeno je razrešavanje zavisnosti" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Obrađujem zavisnost: %s za paket: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Nerazrešena zavisnost: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -118582,7 +121265,7 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -118590,7 +121273,7 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -118598,7 +121281,7 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -118606,44 +121289,51 @@ index 2576fa8..cd9da35 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Sukob pri obradi: %s se sukobi sa %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." - msgstr "" - "--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte." +-msgstr "" +-"--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte." ++msgstr "--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Preuzimam zaglavlje za %s radi pakovanja u skup transakcije." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "Izvršava se" @@ -118669,7 +121359,7 @@ index 2576fa8..cd9da35 100644 msgstr "Praćen/zaustavljen" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Nepoznat" @@ -118707,25 +121397,31 @@ index 2576fa8..cd9da35 100644 msgid "" "\n" "\n" -@@ -1423,7 +1519,7 @@ msgstr "" - "\n" - "Izlazim kada korisnik otkaže" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Izlazim kada korisnik otkaže" ++msgstr "\n\nIzlazim kada korisnik otkaže" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1433,7 +1529,7 @@ msgstr "" - "\n" - "Izlazim kada se slomi cev" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Izlazim kada se slomi cev" ++msgstr "\n\nIzlazim kada se slomi cev" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1441,42 +1537,42 @@ msgid "" +@@ -1441,50 +1522,47 @@ msgid "" "%s" msgstr "" @@ -118757,8 +121453,9 @@ index 2576fa8..cd9da35 100644 -#: ../utils.py:346 ../yummain.py:194 +#: ../utils.py:417 ../yummain.py:205 msgid " You could try using --skip-broken to work around the problem" - msgstr "" - " Možete da probate upotrebu --skip-broken opcije radi zaobilaženja problema" +-msgstr "" +-" Možete da probate upotrebu --skip-broken opcije radi zaobilaženja problema" ++msgstr " Možete da probate upotrebu --skip-broken opcije radi zaobilaženja problema" -#: ../utils.py:348 ../yummain.py:87 +#: ../utils.py:419 ../yummain.py:87 @@ -118776,16 +121473,17 @@ index 2576fa8..cd9da35 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1484,7 +1580,7 @@ msgstr "" - "\n" - "Zavisnosti su razrešene" +-msgstr "" +-"\n" +-"Zavisnosti su razrešene" ++msgstr "\nZavisnosti su razrešene" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Završeno!" -@@ -1496,7 +1592,7 @@ msgstr "" +@@ -1496,7 +1574,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "Morate biti root korisnik da biste izvršili ovu komandu." @@ -118794,9 +121492,25 @@ index 2576fa8..cd9da35 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1526,362 +1622,351 @@ msgstr "" +@@ -1511,475 +1589,482 @@ msgid "" + "will install it for you.\n" "\n" - "Za više informacija kontaktirajte dobavljača vaše distribucije ili paketa.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Uključili ste proveru paketa pomoću GPG ključeva. Ovo je dobra stvar. \n" +-"Međutim, nemate instaliran nijedan GPG javni ključ. Morate da preuzmete\n" +-"ključeve za pakete koje želite da instalirate i instalirate ih.\n" +-"To možete uraditi izvršavanjem komande:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Takođe, možete odrediti url za ključ koji želite da koristite\n" +-"za riznicu u „gpgkey“ opciji u odeljku vezanim za riznice i yum \n" +-"će ga instalirati za vas.\n" +-"\n" +-"Za više informacija kontaktirajte dobavljača vaše distribucije ili paketa.\n" ++msgstr "\nUključili ste proveru paketa pomoću GPG ključeva. Ovo je dobra stvar. \nMeđutim, nemate instaliran nijedan GPG javni ključ. Morate da preuzmete\nključeve za pakete koje želite da instalirate i instalirate ih.\nTo možete uraditi izvršavanjem komande:\n rpm --import public.gpg.key\n\n\nTakođe, možete odrediti url za ključ koji želite da koristite\nza riznicu u „gpgkey“ opciji u odeljku vezanim za riznice i yum \nće ga instalirati za vas.\n\nZa više informacija kontaktirajte dobavljača vaše distribucije ili paketa.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -118847,15 +121561,17 @@ index 2576fa8..cd9da35 100644 +#: ../yumcommands.py:167 #, python-format msgid "File %s given as argument to shell does not exist." - msgstr "" - "Ne postoji datoteka %s, koja je prosleđena kao argument komandnom okruženju." +-msgstr "" +-"Ne postoji datoteka %s, koja je prosleđena kao argument komandnom okruženju." ++msgstr "Ne postoji datoteka %s, koja je prosleđena kao argument komandnom okruženju." -#: ../yumcommands.py:131 +#: ../yumcommands.py:173 msgid "Error: more than one file given as argument to shell." - msgstr "" - "Greška: više od jedne datoteke je prosleđeno kao argument komandnom " - "okruženju." +-msgstr "" +-"Greška: više od jedne datoteke je prosleđeno kao argument komandnom " +-"okruženju." ++msgstr "Greška: više od jedne datoteke je prosleđeno kao argument komandnom okruženju." -#: ../yumcommands.py:148 +#: ../yumcommands.py:192 @@ -119095,335 +121811,340 @@ index 2576fa8..cd9da35 100644 msgstr "Prikaži podešene softverske riznice" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "uključena" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "isključena" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Revizija riznice : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Distro oznake riznice: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Metalink riznice : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Ažurirano : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "repo id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "repo ime" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Prikaži korisnu poruku o upotrebi" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Nije dostupna pomoć za %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1891,7 +1976,7 @@ msgstr "" - "\n" - "pseudonimi: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"pseudonimi: " ++msgstr "\n\npseudonimi: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1901,85 +1986,125 @@ msgstr "" - "\n" - "pseudonim: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"pseudonim: " ++msgstr "\n\npseudonim: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Postavljam proces ponovne instalacije" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "ponovno instaliram paket" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Postavljam proces unazađivanja" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "unazadi paket" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1990,28 +2115,34 @@ msgstr "" +@@ -1990,105 +2075,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" -+msgstr "" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." msgstr "" - "Neki drugi program trenutno drži yum zaključanim; čekam da taj program " - "izađe..." +-"Neki drugi program trenutno drži yum zaključanim; čekam da taj program " +-"izađe..." -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Neki drugi program trenutno drži yum zaključanim; čekam da taj program izađe..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -119444,276 +122165,281 @@ index 2576fa8..cd9da35 100644 msgid "" "\n" "\n" -@@ -2021,74 +2152,74 @@ msgstr "" - "\n" - "Izlazim kada korisnik otkaže." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Izlazim kada korisnik otkaže." ++msgstr "\n\nIzlazim kada korisnik otkaže." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() neće biti prisutna u budućim verzijama Yuma.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Postavljam TransactionSets pre nego što se podigne klasa podešavanja" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Pogrešan tsflag u datoteci podešavanja: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Pretražujem pkgSack za zavisnost: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Član: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s prebačen za instalaciju" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Dodajem paket %s u načinu rada %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Uklanjam paket %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s zahteva: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Potreban zahtev je već potražen, obmanjujem" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Potreban zahtev nije ime paketa. Tražim: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Mogući snabdevač: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Režim je %s za snabdevača %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Režim za paket koji snabdeva %s: %s" -@@ -2096,114 +2227,114 @@ msgstr "Režim za paket koji snabdeva %s: %s" +@@ -2096,1017 +2182,1031 @@ msgstr "Režim za paket koji snabdeva %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: %s paket zahteva da %s bude označen za brisanje" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: menjam %s sa %s radi razrešavanja zavisnosti." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: ažuriram %s radi razrešavanja zavisnosti." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Ne mogu da pronađem putanju ažuriranja za zavisnost za: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Brzo povezivanje paketa %s kao zahteva za %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "%s je u pruženim paketima ali je već instaliran, uklanjam ga." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potencijalno razrešavanje paketa %s ima noviji primerak u ts-u." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potencijalno razrešavanje paketa %s ima instaliran noviji primerak." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s je već u ts-u, preskačem ga" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: označavam %s kao ažuriranje za %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: označavam %s kao instalaciju za %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Uspeh - prazna transakcija" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Ponovo pokrećem petlju" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Završetak procesa zavisnosti" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Uspeh - zavisnosti su razrešene" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Proveravam zavisnosti za %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "tražim %s kao zahtev za %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Pokrećem compare_providers() za %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "bolja arhitektura u paketu %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s prevazilazi %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2212,142 +2343,142 @@ msgstr "" - "archdist uporedio %s sa %s na %s\n" - " Pobednik: %s" + " Winner: %s" +-msgstr "" +-"archdist uporedio %s sa %s na %s\n" +-" Pobednik: %s" ++msgstr "archdist uporedio %s sa %s na %s\n Pobednik: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "zajednički izvorni rpm %s i %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "zajednički prefiks %s između %s i %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Najbolji redosled: %s" @@ -119846,9 +122572,10 @@ index 2576fa8..cd9da35 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2355,21 +2486,21 @@ msgstr "" - "Ostale su nedovršene transakcije. Možda bi prvo trebalo da izvršite yum-" - "complete-transaction da biste ih završili." +-msgstr "" +-"Ostale su nedovršene transakcije. Možda bi prvo trebalo da izvršite yum-" +-"complete-transaction da biste ih završili." ++msgstr "Ostale su nedovršene transakcije. Možda bi prvo trebalo da izvršite yum-complete-transaction da biste ih završili." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -119872,9 +122599,10 @@ index 2576fa8..cd9da35 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2377,130 +2508,122 @@ msgstr "" - "\n" - "Paketi su preskočeni zbog problema sa zavisnostima:" +-msgstr "" +-"\n" +-"Paketi su preskočeni zbog problema sa zavisnostima:" ++msgstr "\nPaketi su preskočeni zbog problema sa zavisnostima:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -119908,9 +122636,10 @@ index 2576fa8..cd9da35 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Upozorenje: došlo je do greške u skriptici ili neke druge nekritične greške " - "tokom transakcije." +-msgstr "" +-"Upozorenje: došlo je do greške u skriptici ili neke druge nekritične greške " +-"tokom transakcije." ++msgstr "Upozorenje: došlo je do greške u skriptici ili neke druge nekritične greške tokom transakcije." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -119932,7 +122661,7 @@ index 2576fa8..cd9da35 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -119943,24 +122672,22 @@ index 2576fa8..cd9da35 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Nisam u mogućnosti da proverim da li je PID %s aktivan" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Nisam u mogućnosti da proverim da li je PID %s aktivan" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -119970,13 +122697,25 @@ index 2576fa8..cd9da35 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Nisam u mogućnosti da proverim da li je PID %s aktivan" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -119984,25 +122723,26 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Ne mogu da izvršim kontrolu sume" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Paket nema odgovarajući kontrolnu sumu" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "paket nema odgovarajuću vrednost kontrolne sume ili je za %s uključeno " - "keširanje" +-msgstr "" +-"paket nema odgovarajuću vrednost kontrolne sume ili je za %s uključeno " +-"keširanje" ++msgstr "paket nema odgovarajuću vrednost kontrolne sume ili je za %s uključeno keširanje" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "koristim lokalni %s umnožak" @@ -120019,69 +122759,70 @@ index 2576fa8..cd9da35 100644 -" * potrebno je %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Zaglavlje nije potpuno." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2508,62 +2631,65 @@ msgstr "" - "Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. " - "Ne mogu da preuzmem %s" +-msgstr "" +-"Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. " +-"Ne mogu da preuzmem %s" ++msgstr "Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. Ne mogu da preuzmem %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Javni ključ za %s nije instaliran" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problem sa otvaranjem paketa %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Javni ključ za %s nije poverljiv" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Paket %s nije potpisan" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Ne mogu da uklonim %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s je uklonjen" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Ne mogu da uklonim %s datoteku %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s datoteka %s je uklonjena" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s datoteke su uklonjene" @@ -120092,28 +122833,29 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Postoji više od jednog identičnog slaganja u grupi za %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ništa se ne slaže sa %s.%s %s:%s-%s iz ažuriranja" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2571,216 +2697,226 @@ msgstr "" - "searchPackages() neće biti prisutna u budućim Yum verzijama." - " Umesto nje koristite searchGenerator(). \n" +-msgstr "" +-"searchPackages() neće biti prisutna u budućim Yum verzijama." +-" Umesto nje koristite searchGenerator(). \n" ++msgstr "searchPackages() neće biti prisutna u budućim Yum verzijama. Umesto nje koristite searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Pretražujem %d pakete" @@ -120124,62 +122866,62 @@ index 2576fa8..cd9da35 100644 +msgstr[2] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "tražim paket %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "tražim u unosima datoteka" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "tražim u unosima dostavljača" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Nema dostupnih podataka o grupama za podešene riznice" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Ne postoji grupa pod imenom %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "paket %s nije označen u grupi %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Dodajem paket %s iz grupe %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Nijedan paket pod imenom %s nije dostupan za instalaciju" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -120187,79 +122929,79 @@ index 2576fa8..cd9da35 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Grupa paketa %s nije nađena u packagesacku" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Nema pronađenih paketa za %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Objekat paketa nije bio primerak objekta paketa" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Nije određeno ništa za instalaciju" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Proveravam virtuelnu dostavu ili dostavu datoteke za %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Ne postoji slaganje za argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Paket %s je instaliran i nije dostupan" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Nema paketa dostupnih za instalaciju" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paket: %s - već je u skupu transakcije" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -120267,63 +123009,64 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paket %s je zamenjen paketom %s, pokušavam da namesto instaliram %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Već je instalirana najnovija verzija paketa %s" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." - msgstr "" - "Paket koji se poklapa sa %s je već instaliran. Proveravam za noviju verziju." +-msgstr "" +-"Paket koji se poklapa sa %s je već instaliran. Proveravam za noviju verziju." ++msgstr "Paket koji se poklapa sa %s je već instaliran. Proveravam za noviju verziju." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Ažuriram sve" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Ne ažuriram pakete koji su već prevaziđeni: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paket je već prevaziđen: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Ne ažuriram pakete koji su već ažurirani: %s.%s %s:%s-%s" @@ -120331,66 +123074,69 @@ index 2576fa8..cd9da35 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Nijedan paket nije određen za uklanjanje" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Ispitujem %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" - msgstr "" - "Ne mogu da dodam paket %s u transakciju. Arhitektura nije usaglašena: %s" +-msgstr "" +-"Ne mogu da dodam paket %s u transakciju. Arhitektura nije usaglašena: %s" ++msgstr "Ne mogu da dodam paket %s u transakciju. Arhitektura nije usaglašena: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2789,138 +2925,145 @@ msgstr "" - "Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju " - "da biste ga instalirali." + "instead." +-msgstr "" +-"Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju " +-"da biste ga instalirali." ++msgstr "Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju da biste ga instalirali." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -120398,119 +123144,120 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Izuzimam %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Označavam %s za instalaciju" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Označavam %s kao ažuriranje za %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: ne ažurira instalirani paket." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Ne mogu da otvorim datoteku: %s. Preskačem je." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" - msgstr "" - "Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje" +-msgstr "" +-"Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje" ++msgstr "Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Nema paketa dostupnih za unazađivanje" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paketu %s su dozvoljene mnogostruke instalacije, preskačem ga" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Nema dostupnog odgovarajućeg paketa: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Samo je nadgradnja dostupna za paket: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Dobavljanje GPG ključa nije uspelo: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Raščlanjivanje GPG ključa nije uspelo: ključ nema vrednost %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -120524,7 +123271,7 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -120536,60 +123283,62 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG ključ na %s (0x%s) je već instaliran" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Nije uspeo uvoz ključa (kod %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Ključ je uspešno uvezen" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2929,184 +3072,208 @@ msgstr "" - "GPG ključevi izlistani za „%s“ riznicu su već instalirani ali nisu odgovarajući za ovaj paket.\n" - "Proverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG ključevi izlistani za „%s“ riznicu su već instalirani ali nisu odgovarajući za ovaj paket.\n" +-"Proverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu." ++msgstr "GPG ključevi izlistani za „%s“ riznicu su već instalirani ali nisu odgovarajući za ovaj paket.\nProverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Uvoz ključa(ključeva) nije pomogao, pogrešan ključ(ključevi)?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG ključ na %s (0x%s) je već uvezen" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Nije uspeo uvoz ključa" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -120597,117 +123346,117 @@ index 2576fa8..cd9da35 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Ne mogu da pronađem odgovarajući odraz." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Pojavile su se greške za vreme preuzimanja paketa." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Prijavite ovu grešku kod %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Greške pri proveri transakcije: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -120759,9 +123508,10 @@ index 2576fa8..cd9da35 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom" - " „%s“" +-msgstr "" +-"U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom" +-" „%s“" ++msgstr "U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom „%s“" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -120809,54 +123559,75 @@ index 2576fa8..cd9da35 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3115,6 +3282,17 @@ msgstr "" +@@ -3115,6 +3215,19 @@ msgstr "" msgid "Repackaging" msgstr "Ponovno pakovanje" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Nedovoljna količina prostora u direktorijumu %s za preuzimanje\n" -+" * slobodno je %s\n" -+" * potrebno je %s" ++msgstr "Nedovoljna količina prostora u direktorijumu %s za preuzimanje\n * slobodno je %s\n * potrebno je %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3127,9 +3240,7 @@ msgstr "Nije uspela md5 provera za %s RPM" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Ne mogu da otvorim RPM bazu podataka za potrebe čitanja. Možda je već u " +-"upotrebi?" ++msgstr "Ne mogu da otvorim RPM bazu podataka za potrebe čitanja. Možda je već u upotrebi?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3145,5 +3256,3 @@ msgstr "Oštećeno zaglavlje %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Greška pri otvaranju rpm-a %s - greška %s" +- +- diff --git a/po/sv.po b/po/sv.po -index b9c109b..fb61831 100644 +index b9c109b..e6adf8b 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2,14 +2,15 @@ +@@ -2,946 +2,958 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Göran Uddeborg , 2011 +# Translators: -+# Göran Uddeborg , 2011. ++# Göran Uddeborg , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-25 16:01+0000\n" -+"Last-Translator: goeran \n" - "Language-Team: Swedish (http://www.transifex.net/projects/p/yum/team/sv/)\n" +-"Language-Team: Swedish (http://www.transifex.net/projects/p/yum/team/sv/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2012-02-18 14:56+0000\n" ++"Last-Translator: Göran Uddeborg \n" ++"Language-Team: Swedish (http://www.transifex.net/projects/p/yum/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,122 +18,124 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Uppdaterar" @@ -120867,31 +123638,31 @@ index b9c109b..fb61831 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Installerar" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Utfasad" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Uppdaterade" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Raderade" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Installerade" @@ -120918,7 +123689,7 @@ index b9c109b..fb61831 100644 msgstr "Raderade: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Tar bort" @@ -120928,69 +123699,69 @@ index b9c109b..fb61831 100644 msgstr "Rensar upp" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Kommando \"%s\" redan definierat" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Gör i ordning förråd" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Läser in förrådsmetadata från lokala filer" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Konfigurationsfel: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Fel bland flaggor: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Installerade: %s-%s %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Byggde : %s %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Verkställde : %s %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Du måste ange något kommando" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Inget sådant kommando: %s. Använd %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Diskbehov:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " Åtminstone %d MB mer utrymme behövs på filsystemet %s.\n" @@ -121001,102 +123772,104 @@ index b9c109b..fb61831 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -140,60 +143,60 @@ msgstr "" - "Felsammandrag\n" - "-------------\n" +-msgstr "" +-"Felsammandrag\n" +-"-------------\n" ++msgstr "Felsammandrag\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "Försöker köra transaktionen men det finns inget att göra. Avslutar." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Avslutar på användarens order" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Hämtar paket:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Fel när paket hämtades:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Kör transaktionskontroll" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "FEL Du behöver uppdatera rpm för att hantera:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "FEL med transaktionskontroll mot depsolve:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM behöver uppdateras" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Vänligen rapportera detta fel i %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Kör transaktionstest" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Transaktionskontrollfel:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Transaktionskontrollen lyckades" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Kör transaktionen" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -201,91 +204,110 @@ msgstr "" - "Vägrar att automatiskt importera nycklar vid oövervakad körning.\n" - "Använd \"-y\" för att åsidosätta." +-msgstr "" +-"Vägrar att automatiskt importera nycklar vid oövervakad körning.\n" +-"Använd \"-y\" för att åsidosätta." ++msgstr "Vägrar att automatiskt importera nycklar vid oövervakad körning.\nAnvänd \"-y\" för att åsidosätta." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Du kanske menade: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Paket %s%s%s tillgängliga, men inte installerade." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Inget paket %s%s%s tillgängligt." @@ -121104,7 +123877,7 @@ index b9c109b..fb61831 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Paket att installera" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -121113,13 +123886,13 @@ index b9c109b..fb61831 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Inget att göra" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d paket noterade att uppdateras" @@ -121129,12 +123902,12 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket noterade att uppdateras" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Inga paket noterade att uppdateras" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d paket noterade för distributionssynkronisering" @@ -121144,12 +123917,12 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket noterade för distributionssynkronisering" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "Inga paket noterade för distributionssynkronisering" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d paket noterade att tas bort" @@ -121159,14 +123932,14 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket noterade att tas bort" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Inga paket noterade att tas bort" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Paket att nedgradera" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -121174,13 +123947,13 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket att nedgradera" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (från %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Installerat paket %s%s%s%s inte tillgängligt." @@ -121188,7 +123961,7 @@ index b9c109b..fb61831 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Paket att ominstallera" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -121196,159 +123969,163 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket att ominstallera" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Inga paket angivna" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Paket att installera" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "N/S matchade: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Matchning %sendast%s av namn och sammandrag, använd \"search all\" för " - "allting." +-msgstr "" +-" Matchning %sendast%s av namn och sammandrag, använd \"search all\" för " +-"allting." ++msgstr " Matchning %sendast%s av namn och sammandrag, använd \"search all\" för allting." -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -293,150 +315,154 @@ msgstr "" - " Matchning %sendast%s av fullständigt namn och sammandrag, använd \"search " - "all\" för allting." +-msgstr "" +-" Matchning %sendast%s av fullständigt namn och sammandrag, använd \"search " +-"all\" för allting." ++msgstr " Matchning %sendast%s av fullständigt namn och sammandrag, använd \"search all\" för allting." -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Matchade: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " Matchning %shuvudsakligen%s av namn och sammandrag, använd \"search all\" " - "för allting." +-msgstr "" +-" Matchning %shuvudsakligen%s av namn och sammandrag, använd \"search all\" " +-"för allting." ++msgstr " Matchning %shuvudsakligen%s av namn och sammandrag, använd \"search all\" för allting." -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Varning: Ingen matchning hittades för: %s" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Inga matchningar hittades" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Inga paket hittades för %s" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Rensar förråd: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Rensar upp allt" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Rensar upp huvuden" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Rensar upp paket" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Rensar upp xml-metadata" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Rensar upp databas-cache" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Rensar upp expire-cache-metadata" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Rensar upp cachad rpmdb-data" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Rensar upp insticksmoduler" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Varning: Inga grupper matchar: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Installerade grupper:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Installerade språkgrupper:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Tillgängliga grupper:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Tillgängliga språkgrupper:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Klart" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Varning: Grupp %s finns inte." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "Inget paket i någon begärd grupp är tillgängligt för installation eller " - "uppdatering" +-msgstr "" +-"Inget paket i någon begärd grupp är tillgängligt för installation eller " +-"uppdatering" ++msgstr "Inget paket i någon begärd grupp är tillgängligt för installation eller uppdatering" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d paket att installera" @@ -121358,18 +124135,18 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket att installera" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Ingen grupp med namnet %s finns" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Inget paket att ta bort från grupper" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d paket att ta bort" @@ -121379,553 +124156,561 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d paket att ta bort" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Paket %s är redan installerat, hoppar över" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Kastar ojämförbart paket %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" - msgstr "" - "Ingen annat %s installerat, lägger till listan för potentiell installation" +-msgstr "" +-"Ingen annat %s installerat, lägger till listan för potentiell installation" ++msgstr "Ingen annat %s installerat, lägger till listan för potentiell installation" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Insticksmodulsalternativ" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Kommandoradsfel: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -447,284 +473,288 @@ msgstr "" "\n" - "%s: flaggan %s behöver ett argument" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: flaggan %s behöver ett argument" ++msgstr "\n\n%s: flaggan %s behöver ett argument" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color tar en av: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "--installroot måste vara en absolut sökväg: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "visa detta hjälpmeddelande och avsluta" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "var tolerant vid fel" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "kör helt från systemets cache, uppdatera inte cachen" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "konfigurationsfilens plats" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "maximal tid att vänta på kommandon" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "nivå på felsökningsutskrifter" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "visa dubletter, i förråd, i list-/search-kommandon" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "nivå på felutskrifter" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "nivå på felsökningsutskrifter för rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "tyst operation" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "utförlig operation" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "svara ja på alla frågor" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "svara nej på alla frågor" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "visa Yum-version och avsluta" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "ange installationsrot" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "aktivera ett eller flera förråd (jokrertecken tillåts)" +-msgstr "aktivera ett eller flera förråd (jokrertecken tillåts)" ++msgstr "aktivera ett eller flera förråd (jokertecken tillåts)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "inaktivera ett eller flera förråd (jokertecken tillåts)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "uteslut paket via namn eller mönster" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "inaktivera uteslutningar från main, för ett förråd, eller för allt" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "aktivera bearbetning av utfasningar under uppdateringar" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "inaktivera Yum-insticksmoduler" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "inaktivera kontroll av gpg-signatur" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "inaktivera insticksmoduler efter namn" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "aktivera insticksmoduler efter namn" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "hoppa över paket med problem vid beroendeupplösning" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "styr om färg skall användas" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "sätt värdet på $releasever i yum-konfigurations- och repo-filer" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "sätt godtyckliga konfigurations- och förrådsalternativ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "jan" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "feb" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "mar" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "apr" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "maj" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "jun" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "jul" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "aug" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "sep" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "okt" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "nov" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "dec" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Försöker med en annan spegel." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Namn : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Arkitektur : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Epok : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Version : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Utgåva : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Storlek : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Förråd : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Från förråd : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Verkställare: %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Verkställt : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Byggt : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Installerat : %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Installerat av: %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Ändrat av : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Sammandrag : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "URL : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Licens : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Beskrivning : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "j" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "ja" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "nej" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Är detta ok [j/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -733,154 +763,156 @@ msgstr "" - "\n" - "Grupp: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Grupp: %s" ++msgstr "\nGrupp: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Grupp-id: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Beskrivning: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Språk: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Obligatoriska paket:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Standardpaket:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Valfria paket:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Villkorliga paket:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "paket: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Inga beroenden för detta paket" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " beroende: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Ej uppfyllt beroende" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Matchat från:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Licens : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Filnamn : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Övrigt : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Ett fel uppstod vid beräkningen av total storlek att hämta" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Total storlek: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Total storlek att hämta: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Installerad storlek: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Ett fel uppstod vid beräkningen av installerad storlek" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Ominstallerar" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Nedgraderar" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Installerar på grund av beroenden" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Uppdaterar på grund av beroenden" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Tar bort på grund av beroenden" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Hoppas över (beroendeproblem)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Inte installerat" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Ej tillgängliga" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Paket" +msgid_plural "Packages" @@ -121933,45 +124718,49 @@ index b9c109b..fb61831 100644 +msgstr[1] "Paket" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Ark" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Version" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Förråd" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Storl." -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " ersätter %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -891,57 +923,58 @@ msgstr "" - "Transaktionssammanfattning\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Transaktionssammanfattning\n" +-"%s\n" ++msgstr "\nTransaktionssammanfattning\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Installerar %5.5s paket\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Installera" @@ -121979,7 +124768,7 @@ index b9c109b..fb61831 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Uppdaterar %5.5s Paket\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Uppgradera" @@ -121987,7 +124776,7 @@ index b9c109b..fb61831 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Tar bort %5.5s paket\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Ta bort" @@ -121995,7 +124784,7 @@ index b9c109b..fb61831 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Ominstallerar %5.5s paket\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Ominstallation" @@ -122003,323 +124792,328 @@ index b9c109b..fb61831 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Nedgraderar %5.5s paket\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Nedgradering" - --#: ../output.py:1165 -+#: ../output.py:1464 ++ ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Beroende paket" +msgstr[1] "Beroende paket" -+ -+#: ../output.py:1524 + +-#: ../output.py:1165 ++#: ../output.py:1531 msgid "Removed" msgstr "Borttagna" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Borttagna beroenden" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Installerade beroenden" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Uppdaterade beroenden" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Ersatte" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Misslyckade" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "två" -@@ -949,7 +982,7 @@ msgstr "två" +@@ -949,565 +961,598 @@ msgstr "två" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -960,365 +993,417 @@ msgstr "" - " Aktuell nedladdning avbröts, %savbryt (ctrl-c) igen%s inom %s%s%s sekunder\n" - "för att avsluta.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Aktuell nedladdning avbröts, %savbryt (ctrl-c) igen%s inom %s%s%s sekunder\n" +-"för att avsluta.\n" ++msgstr "\n Aktuell nedladdning avbröts, %savbryt (ctrl-c) igen%s inom %s%s%s sekunder\nför att avsluta.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "avbrott från användaren" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Totalt" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "UF" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "R" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "O" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "N" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "System" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" - msgstr "" - "Hoppar över sammanslagen transaktion %d till %d, eftersom de överlappar" +-msgstr "" +-"Hoppar över sammanslagen transaktion %d till %d, eftersom de överlappar" ++msgstr "Hoppar över sammanslagen transaktion %d till %d, eftersom de överlappar" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Inga transaktioner" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Felaktiga transaktions ID:n, eller paket, angivna" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Kommandorad" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Inloggad användare" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Datum och tid" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Åtgärd(er)" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Ändrade" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Inget transaktions-ID angivet" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Felaktigt transaktions-ID angivet" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Hittade inte angivet transaktions-ID" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Hittade mer än ett transaktions-ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Inget transaktions-ID, eller paket, angivet" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Nedgraderade" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Äldre" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Nyare" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Transaktions-ID:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Starttid :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Start-rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u sekunder)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u minuter)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u timmar)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u dagar)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Sluttid : " -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Slut-rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Användare :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Returkod :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Avbruten" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Misslyckanden:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Misslyckades:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Lyckades" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Kommandoradsfel:" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Ytterligare icke-standardinformation lagrad: %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Transaktionen utförd med:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Ändrade paket:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Överhoppade paket:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb-problem:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Skriptutdata:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Fel:" @@ -122328,17 +125122,17 @@ index b9c109b..fb61831 100644 -msgstr "Installation" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Ber-inst" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Fasar ut" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Radering" @@ -122351,296 +125145,310 @@ index b9c109b..fb61831 100644 -msgstr "Nedgradering" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Uppdatering" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Tid" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Senaste dagen" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Senaste veckan" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Senaste 2 veckorna" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Senaste 3 månaderna" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Senaste 6 månaderna" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Senaste året" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Mer än ett år tillbaka" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Ingen transaktion %s funnen" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Transaktions-ID:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Tillgänglig ytterligare historieinformation" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: Inga ytterligare data finns med detta namn" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Paket :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "Tillstånd :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Storlek :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Byggvärd :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Byggtid :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Paketerare : " + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Leverantör :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Licens : " + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "URL :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "Käll-RPM : " + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Verkställt :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Verkställare :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Orsak :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Från förråd :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Installerat av :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Ändrat av :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "installerat" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "en uppdatering" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "raderat" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "ominstallerat" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "en nedgradering" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "utfasning" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "uppdaterat" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "utfasat" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Paket %s.%s %s:%s-%s blir %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Kör transaktionskontroll" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Startar om beroendeupplösning med nya ändringar." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Avslutade beroendeupplösning" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Bearbetar beroende: %s för paket: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Behåller paketet: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Ej upplöst beroende: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Paket: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1327,7 +1412,7 @@ msgstr "" - "\n" - " Behöver: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Behöver: %s" ++msgstr "\n Behöver: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1336,7 +1421,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1345,7 +1430,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1354,85 +1439,85 @@ msgstr "" - " Finns inte" +-msgstr "" +-"\n" +-" Finns inte" ++msgstr "\n Finns inte" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Uppdaterat av" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Nedgraderat av" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Utfasat av" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Tillgängliga" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Bearbetar konflikt: %s står i konflikt med %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Fyller transaktionsmängden med valda paket. Var god dröj." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> Hämtar huvud för %s för att paketera i transaktionsmängden." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Verifierar" ++ +#: ../utils.py:129 msgid "Running" msgstr "Kör" @@ -122666,7 +125474,7 @@ index b9c109b..fb61831 100644 msgstr "Spårad/Stoppad" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Okänd" @@ -122704,36 +125512,47 @@ index b9c109b..fb61831 100644 msgid "" "\n" "\n" -@@ -1442,7 +1527,7 @@ msgstr "" - "\n" - "Slutar efter att användaren avbröt" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Slutar efter att användaren avbröt" ++msgstr "\n\nSlutar efter att användaren avbröt" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1452,7 +1537,7 @@ msgstr "" - "\n" - "Slutar med brutet rör (pipe)" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Slutar med brutet rör (pipe)" ++msgstr "\n\nSlutar med brutet rör (pipe)" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1463,7 +1548,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1471,35 +1556,35 @@ msgstr "" - "Ett annat program håller för närvarande yum-låset, avslutar som konfigurerad" - " av exit_on_lock" +-msgstr "" +-"Ett annat program håller för närvarande yum-låset, avslutar som konfigurerad" +-" av exit_on_lock" ++msgstr "Ett annat program håller för närvarande yum-låset, avslutar som konfigurerad av exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -122774,16 +125593,17 @@ index b9c109b..fb61831 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1507,7 +1592,7 @@ msgstr "" - "\n" - "Beroenden upplösta" +-msgstr "" +-"\n" +-"Beroenden upplösta" ++msgstr "\nBeroenden upplösta" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Klart!" -@@ -1519,7 +1604,7 @@ msgstr " Minianvändning:\n" +@@ -1519,7 +1564,7 @@ msgstr " Minianvändning:\n" msgid "You need to be root to perform this command." msgstr "Du måste vara root för att utföra detta kommando." @@ -122792,9 +125612,25 @@ index b9c109b..fb61831 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1549,53 +1634,53 @@ msgstr "" +@@ -1534,476 +1579,482 @@ msgid "" + "will install it for you.\n" "\n" - "För mer information, kontakta leverantören av din distribution eller paket.\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Du har aktiverat kontroll av paket med GPG-nycklar. Det är bra. Doch har\n" +-"du inte några publika GPG-nycklar installerade. Du behöver hämta nycklarna\n" +-"för paket som du vill installera och installera dem.\n" +-"Du kan göra det genom att köra kommandot:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Alternativt kan du ange URL:en till nyckeln du vill använda för ett förråd\n" +-"i alternativet gpgkey i en förrådssektion och yum kommer installera den åt\n" +-"dig.\n" +-"\n" +-"För mer information, kontakta leverantören av din distribution eller paket.\n" ++msgstr "\nDu har aktiverat kontroll av paket med GPG-nycklar. Det är bra. Doch har\ndu inte några publika GPG-nycklar installerade. Du behöver hämta nycklarna\nför paket som du vill installera och installera dem.\nDu kan göra det genom att köra kommandot:\n rpm --import public.gpg.key\n\n\nAlternativt kan du ange URL:en till nyckeln du vill använda för ett förråd\ni alternativet gpgkey i en förrådssektion och yum kommer installera den åt\ndig.\n\nFör mer information, kontakta leverantören av din distribution eller paket.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -122858,9 +125694,12 @@ index b9c109b..fb61831 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1605,307 +1690,296 @@ msgstr "" - " Kör ”yum repolist all” för att se vilka förråd du har.\n" - " Du kan aktivera förråd med yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Det finns inga aktiverade förråd.\n" +-" Kör ”yum repolist all” för att se vilka förråd du har.\n" +-" Du kan aktivera förråd med yum-config-manager --enable " ++msgstr "Det finns inga aktiverade förråd.\n Kör ”yum repolist all” för att se vilka förråd du har.\n Du kan aktivera förråd med yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -122895,8 +125734,9 @@ index b9c109b..fb61831 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "Synkroniser installerade paket med de senaste tillgängliga versionerna" +-msgstr "" +-"Synkroniser installerade paket med de senaste tillgängliga versionerna" ++msgstr "Synkroniser installerade paket med de senaste tillgängliga versionerna" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -123093,120 +125933,120 @@ index b9c109b..fb61831 100644 msgstr "Visa konfigurerade programvaruförråd" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "aktivt" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "inaktivt" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Förråds-id : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Förrådsnamn : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Förrådsstatus : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Förrådsversion : " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Förrådstaggar : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Förråds-distro-taggar: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Förråd uppdaterat: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Förrådspaket : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Förrådstorlek : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Förrådsbasurl : " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Förrådsmetalänk : " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Uppdaterat :" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Förrådspeglar : " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Aldrig (senast: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Omedelbart (senast: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s sekunder (senast: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Förråd går ut : " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Förråd utesluter : " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Förråd inkluderar: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Förråd uteslutet : " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Förrådfilnamn: " @@ -123214,215 +126054,221 @@ index b9c109b..fb61831 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "förråds-id" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "status" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "förrådsnamn" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Visa ett hjälpsamt meddelande om användning" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Ingen hjälp tillgänglig för %s" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1915,7 +1989,7 @@ msgstr "" - "\n" - "alias: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1925,85 +1999,125 @@ msgstr "" - "\n" "alias: " +-msgstr "" +-"\n" +-"\n" +-"alias: " ++msgstr "\n\nalias: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Förbereder ominstallationsprocessen" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "ominstallera ett paket" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Förbereder nedgraderingsprocessen" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "nedgradera ett paket" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Visa en version för maskinen och/eller tillgängliga förråd." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum versionsgrupper:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Grupp:" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Paket:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Installerade:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Gruppinstallerade:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Tillgängliga:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Grupptillgängliga:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Visa, eller använd, transaktionshistorien" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Transaktioner:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Starttid :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Sluttid : " + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Antal :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " rpm-DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " yum-DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Ogiltigt underkommando till history, använd: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "Du har inte tillgång till historie-DB:n." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Kontrollera om det finns problem i rpmdb:n" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "läs in en sparad transaktion från filnamn" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "Ingen fil med sparad transaktion angiven." -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "läser in transaktionen från %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Transaktionen inläst från %s med %s medlemmar" -@@ -2014,28 +2128,36 @@ msgstr "Transaktionen inläst från %s med %s medlemmar" +@@ -2014,105 +2065,106 @@ msgstr "Transaktionen inläst från %s med %s medlemmar" msgid " Yum checks failed: %s" msgstr " Yums kontroller misslyckades: %s" -#: ../yummain.py:114 +-msgid "" +-"Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "" +-"Ett annat program håller för närvarande yum-låset, väntar på att den skall " +-"avsluta ..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" +msgstr "Inga läs-/körrättigheter i aktuell katalog, flyttar till /" -+ -+#: ../yummain.py:124 -+msgid "Can't create lock file; exiting" -+msgstr "Det går inte att skapa en låsfil, avslutar" -+ -+#: ../yummain.py:128 - msgid "" - "Another app is currently holding the yum lock; waiting for it to exit..." - msgstr "" - "Ett annat program håller för närvarande yum-låset, väntar på att den skall " - "avsluta ..." -#: ../yummain.py:120 --msgid "Can't create lock file; exiting" --msgstr "Det går inte att skapa en låsfil, avslutar" -- ++#: ../yummain.py:124 + msgid "Can't create lock file; exiting" + msgstr "Det går inte att skapa en låsfil, avslutar" + ++#: ../yummain.py:128 ++msgid "" ++"Another app is currently holding the yum lock; waiting for it to exit..." ++msgstr "Ett annat program håller för närvarande yum-låset, väntar på att den skall avsluta ..." ++ #. Depsolve stage -#: ../yummain.py:167 +#: ../yummain.py:178 @@ -123437,287 +126283,291 @@ index b9c109b..fb61831 100644 +msgid "" +"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" -+msgstr "" -+"Din transaktion sparades, kör om den med:\n" -+" yum load-transaction %s" ++msgstr "Din transaktion sparades, kör om den med:\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2045,74 +2167,74 @@ msgstr "" - "\n" - "Slutar efter att användaren avbröt." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Slutar efter att användaren avbröt." ++msgstr "\n\nSlutar efter att användaren avbröt." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() kommer att försvinna i en framtida version av Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Förbereder transaktionsmängder före konfigurationsklass är uppe" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Ogiltig tsflag i konfigurationsfil: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Söker pkgSack efter beroende: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Medlem: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s konverterad till att installera" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Lägger till paket %s i läge %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Tar bort paket %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s behöver: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s behöver %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Nödvändigt behov har redan slagits upp, fuskar" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Nödvändigt behov är inte ett paketnamn. Slår upp: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Potentiell tillhandahållare: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Läget är %s för tillhandahållare av %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Läge för paket som tillhandahåller %s: %s" -@@ -2120,116 +2242,116 @@ msgstr "Läge för paket som tillhandahåller %s: %s" +@@ -2120,1040 +2172,1029 @@ msgstr "Läge för paket som tillhandahåller %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Försöker uppdatera %s för att lösa upp beroenden" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Hittar ingen uppdateringsväg för %s. Misslyckat!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: paket %s behöver %s noteras att raderas" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "TSINFO: Fasar ut %s med %s för att lösa upp beroenden." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: Uppdaterar %s för att lösa upp beroenden" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Hittar ingen uppdateringsväg för beroende för: %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Snabb matcning av %s mot behov för %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s finns bland tillhandahållande paket men det är redan installerat, tar " - "bort." +-msgstr "" +-"%s finns bland tillhandahållande paket men det är redan installerat, tar " +-"bort." ++msgstr "%s finns bland tillhandahållande paket men det är redan installerat, tar bort." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Potentiellt upplösande paket %s har nyare instans i ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Potentiellt upplösande paket %s har nyare instans installerad." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s är redan i ts, hoppar över denna" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: Noterar %s som en uppdatering av %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: Noterar %s som en installation av %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Klart - tom transaktion" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Startar om slingan" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Beroendeprocessen avslutas" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Klart - beroenden upplösta" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Kontrollerar beroenden för %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "letar efter %s som ett behov för %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Kör compare_providers() för %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "bättre arkitektur i po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s fasar ut %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2238,142 +2360,142 @@ msgstr "" - "arkitekturavstånd jämför %s med %s på %s\n" - " Vinnare: %s" + " Winner: %s" +-msgstr "" +-"arkitekturavstånd jämför %s med %s på %s\n" +-" Vinnare: %s" ++msgstr "arkitekturavstånd jämför %s med %s på %s\n Vinnare: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "samma käll-rpm %s och %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "baspaket %s är installerat för %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "gemensamt prefix för %s mellan %s och %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "behöver minst: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "Vinnare: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Förlorare(med %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Bästa ordning: %s" @@ -123850,9 +126700,10 @@ index b9c109b..fb61831 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2381,21 +2503,21 @@ msgstr "" - "Det finns oavslutade transaktioner kvar. Du kan överväga att köra yum-" - "complete-transaction först för att avsluta dem." +-msgstr "" +-"Det finns oavslutade transaktioner kvar. Du kan överväga att köra yum-" +-"complete-transaction först för att avsluta dem." ++msgstr "Det finns oavslutade transaktioner kvar. Du kan överväga att köra yum-complete-transaction först för att avsluta dem." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -123876,9 +126727,10 @@ index b9c109b..fb61831 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2403,90 +2525,93 @@ msgstr "" - "\n" - "Paket hoppades över på grund av beroendeproblem:" +-msgstr "" +-"\n" +-"Paket hoppades över på grund av beroendeproblem:" ++msgstr "\nPaket hoppades över på grund av beroendeproblem:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -123891,9 +126743,10 @@ index b9c109b..fb61831 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Hittade %d redan befintliga tidigare rpmdb-problem, ”yum check”-utdata " - "följer:" +-msgstr "" +-"** Hittade %d redan befintliga tidigare rpmdb-problem, ”yum check”-utdata " +-"följer:" ++msgstr "** Hittade %d redan befintliga tidigare rpmdb-problem, ”yum check”-utdata följer:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -123914,9 +126767,10 @@ index b9c109b..fb61831 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Varning: skript- eller annat icke ödesdigert fel inträffade under " - "transaktionen." +-msgstr "" +-"Varning: skript- eller annat icke ödesdigert fel inträffade under " +-"transaktionen." ++msgstr "Varning: skript- eller annat icke ödesdigert fel inträffade under transaktionen." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -123938,7 +126792,7 @@ index b9c109b..fb61831 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s skulle installerats men gjordes det inte!" @@ -123949,24 +126803,22 @@ index b9c109b..fb61831 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s skulle tagits bort men det gjordes inte!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Kunde inte öppna låset %s: %s " - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Kunde inte öppna låset %s: %s " +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Kan inte kontrollera om PID %s är aktiv" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Kan inte kontrollera om PID %s är aktiv" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -123976,39 +126828,54 @@ index b9c109b..fb61831 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Kunde inte skapa lås av %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Kunde inte öppna låset %s: %s " ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Kan inte kontrollera om PID %s är aktiv" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2495,41 +2620,30 @@ msgstr "" - "Paketet matchar inte den avsedda hämtningen. Förslag: kör yum " "--enablerepo=%s clean metadata" +-msgstr "" +-"Paketet matchar inte den avsedda hämtningen. Förslag: kör yum " +-"--enablerepo=%s clean metadata" ++msgstr "Paketet matchar inte den avsedda hämtningen. Förslag: kör yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Kunde inte utföra kontrollsummering" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Paketet stämmer inte med kontrollsumman" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" - msgstr "" - "paketet misslyckas med kontrollsumman men cachning är aktiverat för %s" +-msgstr "" +-"paketet misslyckas med kontrollsumman men cachning är aktiverat för %s" ++msgstr "paketet misslyckas med kontrollsumman men cachning är aktiverat för %s" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "använder lokal kopia av %s" @@ -124025,69 +126892,70 @@ index b9c109b..fb61831 100644 -" * behovet %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Huvudet är inte komplett." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2537,62 +2651,64 @@ msgstr "" - "Huvudet finns inte i den lokala cachen och endast-cache-läget är aktiverat." - " Kan inte hämta %s" +-msgstr "" +-"Huvudet finns inte i den lokala cachen och endast-cache-läget är aktiverat." +-" Kan inte hämta %s" ++msgstr "Huvudet finns inte i den lokala cachen och endast-cache-läget är aktiverat. Kan inte hämta %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Den publika nyckeln för %s är inte installerad" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Problem att öppna paketet %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Den publika nyckeln för %s är inte betrodd" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Paket %s är inte signerat" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Det går inte att ta bort %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s borttaget" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Det går inte att ta bort %s-filen %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s-filen %s borttagen" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s-filer borttagna" @@ -124097,28 +126965,29 @@ index b9c109b..fb61831 100644 +msgstr[1] "%d %s-filer borttagna" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "Mer än en identisk matchning i säcken för %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Ingenting matchar %s.%s %s:%s-%s från uppdateringarna" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2600,122 +2716,125 @@ msgstr "" - "searchPackages() kommer att försvinna i en framtida version av Yum." - " Använd searchGenerator() istället. \n" +-msgstr "" +-"searchPackages() kommer att försvinna i en framtida version av Yum." +-" Använd searchGenerator() istället. \n" ++msgstr "searchPackages() kommer att försvinna i en framtida version av Yum. Använd searchGenerator() istället. \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Söker i %d paket" @@ -124128,62 +126997,62 @@ index b9c109b..fb61831 100644 +msgstr[1] "Söker i %d paket" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "söker i paketet %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "söker i filposter" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "söker i tillhandahållandeposter" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Inga gruppdata är tillgängliga för de konfigurerade förråden" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Det finns ingen grupp med namnet %s" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "paket %s noterades inte i gruppen %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Lägger till paket %s från grupp %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Inget paket med namnet %s är tillgängligt för installation" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Varning: Gruppen %s har inte några paket." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "Gruppen %s har %u villkorliga paket, vilka kan komma att installeras." @@ -124191,144 +127060,147 @@ index b9c109b..fb61831 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "Pakettupel %s fanns inte i paketsäcken" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "Pakettupel %s fanns inte i rpmdb" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Ogiltig versionsflagga från: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Inga paket hittades för %s" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Paketobjektet var inte en paketobjektinstans" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Inget angivet att installeras" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" - msgstr "" - "Kontrollerar virtuella tillhandahållanden eller filtillhandahållanden för %s" +-msgstr "" +-"Kontrollerar virtuella tillhandahållanden eller filtillhandahållanden för %s" ++msgstr "Kontrollerar virtuella tillhandahållanden eller filtillhandahållanden för %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Ingen matchning för argument: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Paket %s installerat och inte tillgänligt" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Inga paket tillgängliga att installera" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Paket: %s - redan i transaktionsmängden" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Paket %s fasas ut av %s, som redan är installerat" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2724,82 +2843,88 @@ msgstr "" - "Paket %s fasas ut av %s, men paketet som fasar ut tillhandahåller inte " - "behoven" + "requirements" +-msgstr "" +-"Paket %s fasas ut av %s, men paketet som fasar ut tillhandahåller inte " +-"behoven" ++msgstr "Paket %s fasas ut av %s, men paketet som fasar ut tillhandahåller inte behoven" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "Paket %s fasas ut av %s, försöker installera %s istället" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Paket %s är redan installerat och senaste version" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Paket som matchar %s är redan installerat. Letar efter uppdatering." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Uppdaterar allt" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Uppdaterar inte paket som redan är utfasade: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Inget paket att uppgradera matchar: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Paketet är redan utfasat: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Uppdaterar inte paket som fasas ut: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Uppdaterar inte paket som redan är uppdaterat: %s.%s %s:%s-%s" @@ -124336,404 +127208,411 @@ index b9c109b..fb61831 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Inget paket att tas bort matchar" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Inget paket att ta bort matchar: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Hoppar över den körande kärnan: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Ta bort %s från transaktionen" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Det går inte att öppna: %s. Hoppar över." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Undersöker %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Det går inte att lokalinstallera deltarpm: %s. Hoppar över." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" -@@ -2807,14 +2932,14 @@ msgstr "" - "Kan inte lägga till paket %s till transaktionen. Inte en kompatibel " - "arkitektur: %s" +-msgstr "" +-"Kan inte lägga till paket %s till transaktionen. Inte en kompatibel " +-"arkitektur: %s" ++msgstr "Kan inte lägga till paket %s till transaktionen. Inte en kompatibel arkitektur: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Det går inte att installera paketet %s. Det är fasas ut av det installerade" - " paketet %s" +-msgstr "" +-"Det går inte att installera paketet %s. Det är fasas ut av det installerade" +-" paketet %s" ++msgstr "Det går inte att installera paketet %s. Det är fasas ut av det installerade paketet %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2823,7 +2948,7 @@ msgstr "" - "Paket %s är inte installerat, kan inte uppdatera det. Kör yum install för " - "att installera det istället." + "instead." +-msgstr "" +-"Paket %s är inte installerat, kan inte uppdatera det. Kör yum install för " +-"att installera det istället." ++msgstr "Paket %s är inte installerat, kan inte uppdatera det. Kör yum install för att installera det istället." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2832,139 +2957,148 @@ msgstr "" - "Paketet %s.%s är inte installerat, kan inte uppdatera det. Kör yum install " - "för att installera det istället." + " instead." +-msgstr "" +-"Paketet %s.%s är inte installerat, kan inte uppdatera det. Kör yum install " +-"för att installera det istället." ++msgstr "Paketet %s.%s är inte installerat, kan inte uppdatera det. Kör yum install för att installera det istället." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Utesluter %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Noterar %s för installation" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Noterar %s som en uppdatering av %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: uppdaterar inte ett installerat paket." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Det går inte att öppna filen: %s. Hoppar över." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Problem att ominstallera: inget paket matchades att tas bort" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "Problem att ominstallera: inget paket %s matchades att installera" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Inga paket tillgängliga att nedgradera" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "Paket %s tillåts multipla installationer, hoppar över" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Ingen matchning för tillgängliga paket: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Endast uppgradering tillgängliga för paket: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Misslyckades nedgradera: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Misslyckades att uppgradera: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Hämtar nyckel från %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Hämtandet av GPG-nyckeln misslyckades: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" - msgstr "" - "GPG-nyckelsignatur på nyckeln %s har inte någon matchande CA-nyckel för " - "förrådet: %s" +-msgstr "" +-"GPG-nyckelsignatur på nyckeln %s har inte någon matchande CA-nyckel för " +-"förrådet: %s" ++msgstr "GPG-nyckelsignatur på nyckeln %s har inte någon matchande CA-nyckel för förrådet: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "GPG-nyckelsignatur verifierad mot CA-nycklar" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Ogiltig GPG-nyckel från %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG-nyckeltolkning misslyckades: nyckeln har inte värde %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" +-msgstr "" +-"Importerar %s-nyckel 0x%s:\n" +-" Användarid: %s\n" +-" Paket : %s (%s)\n" +-" Från : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" Package : %s (%s)\n" +" From : %s" - msgstr "" - "Importerar %s-nyckel 0x%s:\n" --" Användarid: %s\n" --" Paket : %s (%s)\n" --" Från : %s" -+" Användarid : ”%s”\n" -+" Fingeravtryck: %s\n" -+" Paket : %s (%s)\n" -+" Från : %s" ++msgstr "Importerar %s-nyckel 0x%s:\n Användarid : ”%s”\n Fingeravtryck: %s\n Paket : %s (%s)\n Från : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" +-msgstr "" +-"Importerar %s-nyckel 0x%s:\n" +-" Användarid: ”%s”\n" +-" Från : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" - msgstr "" - "Importerar %s-nyckel 0x%s:\n" --" Användarid: ”%s”\n" --" Från : %s" -+" Användarid : ”%s”\n" -+" Fingeravtryck: %s\n" -+" Från : %s" ++msgstr "Importerar %s-nyckel 0x%s:\n Användarid : ”%s”\n Fingeravtryck: %s\n Från : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "GPG-nyckel vid %s (0x%s) är redan installerad" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Nyckelimport misslyckades (kod %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Nyckelimport lyckades" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Installerade inte några nycklar" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2973,25 +3107,25 @@ msgstr "" - "GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta för detta paket.\n" - "Kontrollera att de rätta nyckel-URL:erna är konfigurerade för detta förråd." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta för detta paket.\n" +-"Kontrollera att de rätta nyckel-URL:erna är konfigurerade för detta förråd." ++msgstr "GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta för detta paket.\nKontrollera att de rätta nyckel-URL:erna är konfigurerade för detta förråd." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Import av nycklar hjälpte inte, fel nycklar?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "GPG-nyckel vid %s (0x%s) är redan importerad" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Nyckelimport misslyckades" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Installerade inte några nycklar för förrådet %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3000,160 +3134,184 @@ msgstr "" - "GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta.\n" - "Kontrollera att rätt nyckel-URL:ar är konfigurerade för detta förråd." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta.\n" +-"Kontrollera att rätt nyckel-URL:ar är konfigurerade för detta förråd." ++msgstr "GPG-nycklarna uppräknade för förrådet \"%s\" är redan installerade men de är inte korrekta.\nKontrollera att rätt nyckel-URL:ar är konfigurerade för detta förråd." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Kan inte hitta en lämplig spegel." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Fel uppstod när paket hämtades." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Rapportera gärna detta fel till %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Transaktionstestfel: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Kunde inte sätta cache-katalog: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" - "Beroenden inte upplösta. Kommer inte att spara ouppklarad transaktion." +-msgstr "" +-"Beroenden inte upplösta. Kommer inte att spara ouppklarad transaktion." ++msgstr "Beroenden inte upplösta. Kommer inte att spara ouppklarad transaktion." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Kunde inte spara transaktionsfilen %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "Kunde inte komma åt/läsa sparad transaktion %s: %s " -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "rpmdb-version stämmer inte med sparad transaktionsversion, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " bortser ifrån, som begärt." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " avbryter." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "det går inte att hitta tsflags eller så är tsflags inte ett heltal." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Hittade txmbr i okänt aktuellt tillstånd: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Kunde inte hitta txmbr: %s i tillstånd %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Kunde inte hitta txmbr: %s från ursprung: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Transaktionsmedlemmar, -relationer saknas eller ts har ändrats," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr " bortser ifrån, som begärt. Du måste göra redepsolve!" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s har redan besökts och kan inte tas bort." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Undersöker versionsberoenden för %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s har versionsberoende %s som var var användarinstallerat." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s: uppdaterar inga användarinstallerade versionsberoenden." @@ -124785,9 +127664,10 @@ index b9c109b..fb61831 100644 +#: ../yum/plugins.py:326 #, python-format msgid "Two or more plugins with the name \"%s\" exist in the plugin search path" - msgstr "" - "Två eller flera insticksmoduler med namnet \"%s\" finns i sökvägen för " - "insticksmoduler" +-msgstr "" +-"Två eller flera insticksmoduler med namnet \"%s\" finns i sökvägen för " +-"insticksmoduler" ++msgstr "Två eller flera insticksmoduler med namnet \"%s\" finns i sökvägen för insticksmoduler" -#: ../yum/plugins.py:343 +#: ../yum/plugins.py:346 @@ -124835,29 +127715,48 @@ index b9c109b..fb61831 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s tillhandahåller %s men det kan inte hittas" -@@ -3162,6 +3320,17 @@ msgstr "%s tillhandahåller %s men det kan inte hittas" +@@ -3162,6 +3203,19 @@ msgstr "%s tillhandahåller %s men det kan inte hittas" msgid "Repackaging" msgstr "Paketerar om" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Verifiera: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Otillräckligt utrymme i hämtningskatalogen %s\n" -+" * fritt %s\n" -+" * behovet %s" ++msgstr "Otillräckligt utrymme i hämtningskatalogen %s\n * fritt %s\n * behovet %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3174,9 +3228,7 @@ msgstr "RPM %s misslyckas med md5-kontroll" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Det gick inte att öppna RPM-databasen för läsning. Kanske den redan " +-"används?" ++msgstr "Det gick inte att öppna RPM-databasen för läsning. Kanske den redan används?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3192,5 +3244,3 @@ msgstr "Trasigt huvud %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Fel när rpm %s öppnades - fel %s" +- +- diff --git a/po/uk.po b/po/uk.po -index f5a658d..bb96267 100644 +index f5a658d..79316f3 100644 --- a/po/uk.po +++ b/po/uk.po -@@ -2,14 +2,15 @@ +@@ -2,951 +2,969 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -124867,22 +127766,24 @@ index f5a658d..bb96267 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-18 15:55+0000\n" -+"Last-Translator: yurchor \n" - "Language-Team: Ukrainian (http://www.transifex.net/projects/p/yum/team/uk/)\n" +-"Language-Team: Ukrainian (http://www.transifex.net/projects/p/yum/team/uk/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-03 08:33+0000\n" ++"Last-Translator: Yuri Chornoivan \n" ++"Language-Team: Ukrainian (http://www.transifex.net/projects/p/yum/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,123 +18,128 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "Оновлення" @@ -124893,31 +127794,31 @@ index f5a658d..bb96267 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "Встановлення" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "Став застарілим" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "Оновлено" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "Вилучено" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "Встановлено" @@ -124944,7 +127845,7 @@ index f5a658d..bb96267 100644 msgstr "Вилучено: %s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "Вилучення" @@ -124954,181 +127855,182 @@ index f5a658d..bb96267 100644 msgstr "Очищення диска" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "Команду «%s» вже визначено" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "Налаштування сховищ" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "Читання метаданих сховища з локальних файлів" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "Помилка налаштування: %s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "Помилка у параметрах: %s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " Встановлено: %s-%s у %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " Зібрано : %s о %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " Надіслано : %s о %s" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "Вам слід вказати якусь команду" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "Команди %s не виявлено. Будь ласка, скористайтеся командою %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "Вимоги до диска:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" +-" Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" +msgid_plural " At least %dMB more space needed on the %s filesystem.\n" -+msgstr[0] "" -+" Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" -+msgstr[1] "" -+" Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" -+msgstr[2] "" - " Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" ++msgstr[0] " Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" ++msgstr[1] " Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" ++msgstr[2] " Потрібно принаймні ще %d МБ простору на диску для файлової системи %s.\n" #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -141,62 +147,62 @@ msgstr "" - "Резюме помилок\n" - "-------------\n" +-msgstr "" +-"Резюме помилок\n" +-"-------------\n" ++msgstr "Резюме помилок\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." - msgstr "" - "Спроба виконання операції за умови порожнього списку операцій. Завершуємо " - "роботу." +-msgstr "" +-"Спроба виконання операції за умови порожнього списку операцій. Завершуємо " +-"роботу." ++msgstr "Спроба виконання операції за умови порожнього списку операцій. Завершуємо роботу." -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "Завершення роботи за бажанням користувача" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "Звантаження пакунків:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "Помилка завантаження пакетів:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "Виконання перевірки операції" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "ПОМИЛКА. Вам слід оновити rpm для обробки:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "ПОМИЛКА перевірки дії під час розв’язання залежностей:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM слід оновити" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "Будь ласка, повідомте про цю помилку за адресою %s" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "Запускається операція з перевірки" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "Помилка під час перевірки операції:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "Операцію з перевірки успішно завершено" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "Виконання операції" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -204,92 +210,117 @@ msgstr "" - "Автоматичне імпортування ключів під час некерованого запуску заборонено.\n" - "Скасувати заборону можна параметром «-y»." +-msgstr "" +-"Автоматичне імпортування ключів під час некерованого запуску заборонено.\n" +-"Скасувати заборону можна параметром «-y»." ++msgstr "Автоматичне імпортування ключів під час некерованого запуску заборонено.\nСкасувати заборону можна параметром «-y»." -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * Можливо, ви хотіли використати: " -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "Доступні невстановлені пакунки %s%s%s." -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "Пакунок %s%s%s недоступний." @@ -125136,7 +128038,7 @@ index f5a658d..bb96267 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "Пакунки, які слід встановити" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -125146,13 +128048,13 @@ index f5a658d..bb96267 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "Нічого виконувати" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "%d пакунків позначено для оновлення" @@ -125163,12 +128065,12 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків позначено для оновлення" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "Для оновлення не позначено жодного пакунка" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "%d пакунків позначено для виконання синхронізації дистрибутивів" @@ -125179,13 +128081,14 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків позначено для виконання синхронізації дистрибутивів" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" - msgstr "" - "Для виконання синхронізації дистрибутивів не позначено жодного пакунка" +-msgstr "" +-"Для виконання синхронізації дистрибутивів не позначено жодного пакунка" ++msgstr "Для виконання синхронізації дистрибутивів не позначено жодного пакунка" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "%d пакунків позначено для вилучення" @@ -125196,14 +128099,14 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків позначено для вилучення" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "Для вилучення не позначено жодного пакунка" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "Пакунки, версію яких слід знизити" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -125212,13 +128115,13 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків зі зниженням версії" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr " (з %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "Встановлений пакунок %s%s%s%s недоступний." @@ -125226,7 +128129,7 @@ index f5a658d..bb96267 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "Пакунки для перевстановлення" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -125235,158 +128138,162 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків для перевстановлення" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "Не надано жодного пакунка" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "Пакунки, які слід встановити" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "Відповідність Н/Р: %s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." - msgstr "" - " Виконано пошук %sлише%s за назвою і резюме, скористайтеся «search all» для" - " пошуку у всіх даних" +-msgstr "" +-" Виконано пошук %sлише%s за назвою і резюме, скористайтеся «search all» для" +-" пошуку у всіх даних" ++msgstr " Виконано пошук %sлише%s за назвою і резюме, скористайтеся «search all» для пошуку у всіх даних" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." -@@ -297,148 +328,154 @@ msgstr "" - " Виконано пошук %sлише%s за повною назвою і резюме, скористайтеся «search " - "all» для пошуку у всіх даних" +-msgstr "" +-" Виконано пошук %sлише%s за повною назвою і резюме, скористайтеся «search " +-"all» для пошуку у всіх даних" ++msgstr " Виконано пошук %sлише%s за повною назвою і резюме, скористайтеся «search all» для пошуку у всіх даних" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "Відповідники: %s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." - msgstr "" - " Виконано пошук %sпереважно%s за назвою і резюме, скористайтеся «search " - "all» для пошуку у всіх даних" +-msgstr "" +-" Виконано пошук %sпереважно%s за назвою і резюме, скористайтеся «search " +-"all» для пошуку у всіх даних" ++msgstr " Виконано пошук %sпереважно%s за назвою і резюме, скористайтеся «search all» для пошуку у всіх даних" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "Попередження: відповідників %s не знайдено" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "Не знайдено відповідників" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "Пакунків з %s не знайдено" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "Спорожнення записів сховищ: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "Вилучення всього" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "Вилучення заголовків" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "Вилучення зайвих пакунків" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "Вилучення метаданих xml" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "Вилучення кешу бази даних" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "Вилучення метаданих застарілого кешу" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "Вилучення кешованих даних rpmdb" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "Вилучення додатків" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "Попередження: відповідних груп не знайдено: %s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "Встановлені групи:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "Встановлені групи мов:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "Наявні групи:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "Доступні групи мов:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "Виконано" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "Попередження: групи з назвою %s не існує." -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" - msgstr "" - "У жодній з вказаних груп немає пакунків для встановлення або оновлення" +-msgstr "" +-"У жодній з вказаних груп немає пакунків для встановлення або оновлення" ++msgstr "У жодній з вказаних груп немає пакунків для встановлення або оновлення" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "%d пакунків для встановлення" @@ -125397,18 +128304,18 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків для встановлення" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "Групи з назвою %s не існує" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "Пакунків для вилучення з груп не знайдено" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "%d пакунків для вилучення" @@ -125419,555 +128326,564 @@ index f5a658d..bb96267 100644 +msgstr[2] "%d пакунків для вилучення" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "Пакунок %s вже встановлено, пропускаємо" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "Відкинуто несумісний пакунок %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "Не встановлено інших %s, додаємо до списку потенційного встановлення" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "Параметри додатка" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "Помилка виконання команди: %s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -449,287 +486,291 @@ msgstr "" "\n" - "%s: для параметра %s потрібен аргумент" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: для параметра %s потрібен аргумент" ++msgstr "\n\n%s: для параметра %s потрібен аргумент" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color повинен мати один з аргументів: auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "Аргументом --installroot має бути абсолютний шлях: %s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "показати це довідкове повідомлення і завершити роботу" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "ігнорувати помилки" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "запустити на основі системного кешу, не оновлювати кеш" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "розташування файла налаштувань" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "максимальний час очікування на завершення команди" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "рівень докладності діагностичних повідомлень" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "показати дублікати у сховищах та командах побудови списку та пошуку" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "рівень докладності повідомлень про помилки" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "рівень докладності діагностичних повідомлень rpm" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "обробка без виведення повідомлень" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "докладна обробка команд" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "відповісти «так» на всі питання" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "відповідати «ні» на всі питання" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "показати версію Yum і завершити роботу" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "встановити кореневий каталог встановлення" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" - msgstr "" - "увімкнути одне або декілька сховищ (можна використовувати шаблони заміни)" +-msgstr "" +-"увімкнути одне або декілька сховищ (можна використовувати шаблони заміни)" ++msgstr "увімкнути одне або декілька сховищ (можна використовувати шаблони заміни)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" - msgstr "" - "вимкнути одне або декілька сховищ (можна використовувати шаблони заміни)" +-msgstr "" +-"вимкнути одне або декілька сховищ (можна використовувати шаблони заміни)" ++msgstr "вимкнути одне або декілька сховищ (можна використовувати шаблони заміни)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "виключити пакунки за назвою або формальним виразом" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "вимкнути виключення з main для сховища або на загальному рівні" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "увімкнути обробку застарілих пакунків під час оновлень" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "вимкнути додатки Yum" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "вимкнути перевірку підписів gpg" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "вимкнути додатки за назвою" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "увімкнути додатки за назвою" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "пропустити пакунки з помилками у розв’язанні залежностей" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "визначає, чи слід використовувати розфарбовування" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" - msgstr "" - "встановити значення $releasever у налаштуванні yum config and repo files" +-msgstr "" +-"встановити значення $releasever у налаштуванні yum config and repo files" ++msgstr "встановити значення $releasever у налаштуванні yum config and repo files" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "встановити довільні параметри налаштування і сховищ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "січ" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "лют" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "бер" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "кві" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "тра" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "чер" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "лип" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "сер" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "вер" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "жов" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "лис" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "гру" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "Спроба використання іншого дзеркала." -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "Назва : %s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "Архітектура : %s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "Епоха : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "Версія : %s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "Випуск : %s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "Розмір : %s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "Сховище : %s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "Зі сховища : %s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "Автор : %s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "Час внеску : %s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "Час збирання : %s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "Встановлення: %s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "Користувач : %s" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "Змінено : %s" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "Резюме : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "Адреса : %s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "Ліцензія : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "Опис : " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "так" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "ні" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "Виконати дію? [y/N]: " -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -738,154 +779,157 @@ msgstr "" - "\n" - "Група: %s" + "Group: %s" +-msgstr "" +-"\n" +-"Група: %s" ++msgstr "\nГрупа: %s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " Ід. групи: %s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " Опис: %s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr " Мова: %s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " Обов’язкові пакунки:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " Типові пакунки:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " Додаткові пакунки:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " Залежні пакунки:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "пакунок: %s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " Пакунок не залежить від інших пакунків" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " залежність: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " Незадоволена залежність" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "Відповідність:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "Ліцензія : %s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "Назва файла : %s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "Інше : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "Під час обчислення загального обсягу звантаження сталася помилка" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "Загальний обсяг: %s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "Загальний обсяг звантаження: %s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "Розмір після встановлення: %s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "Під час обчислення обсягу після встановлення сталася помилка" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "Перевстановлення" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "Зниження версії" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "Встановлення для залежностей" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "Оновлення для залежностей" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "Вилучення для залежностей" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "Пропущено (проблеми з залежностями)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "Не встановлено" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "Недоступний" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "Пакунок" +msgid_plural "Packages" @@ -125976,45 +128892,49 @@ index f5a658d..bb96267 100644 +msgstr[2] "Пакунки" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "Архітектура" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "Версія" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "Сховище" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "Розмір" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " заміна %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -896,57 +940,59 @@ msgstr "" - "Резюме операції\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"Резюме операції\n" +-"%s\n" ++msgstr "\nРезюме операції\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "Встановлення %5.5s пакунків\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "Встановити" @@ -126022,7 +128942,7 @@ index f5a658d..bb96267 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "Оновлення %5.5s пакунків\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "Оновити" @@ -126030,7 +128950,7 @@ index f5a658d..bb96267 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "Вилучення %5.5s пакунків\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "Вилучити" @@ -126038,7 +128958,7 @@ index f5a658d..bb96267 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "Перевстановлення %5.5s пакунків\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "Перевстановлення" @@ -126046,323 +128966,327 @@ index f5a658d..bb96267 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "Зниження версії %5.5s пакунків\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "Понизити" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "Залежні пакунки" +msgstr[1] "Залежні пакунки" +msgstr[2] "Залежні пакунки" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "Вилучено" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "Вилучено залежності" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "Встановлено залежності" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "Оновлено залежності" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "Замінено" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "Помилка" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "два" -@@ -954,7 +1000,7 @@ msgstr "два" +@@ -954,564 +972,598 @@ msgstr "два" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -965,364 +1011,416 @@ msgstr "" - " Поточне звантаження скасовано, %sперервіть роботу (ctrl-c) ще раз%s протягом %s%s%s секунд,\n" - "щоб завершити операцію.\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" Поточне звантаження скасовано, %sперервіть роботу (ctrl-c) ще раз%s протягом %s%s%s секунд,\n" +-"щоб завершити операцію.\n" ++msgstr "\n Поточне звантаження скасовано, %sперервіть роботу (ctrl-c) ще раз%s протягом %s%s%s секунд,\nщоб завершити операцію.\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "перервано користувачем" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "Загалом" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "<не встановлено>" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "Система" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "Пропущено операцію з об’єднання %d з %d через перекриття даних" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "Немає операцій" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "Вказано помилкові ідентифікатори операцій або пакунки" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "Командний рядок" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "Користувач" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "Ід." -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "Дата і час" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "Дії" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "Змінено" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "Не вказано ідентифікатора операції" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "Вказано помилковий ідентифікатор операції" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "Не виявлено вказаного ідентифікатора операції" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "Виявлено більше одного ідентифікатора операції!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "Не вказано ідентифікатора операції або назви пакунка" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "Знижено версію" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "Старіший" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "Новіший" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "Ід. операції :" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "Час початку :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "Початок rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "(%u секунд)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "(%u хвилин)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "(%u годин)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "(%u днів)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "Час завершення :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "Завершення rpmdb:" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "Користувач :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "Повернутий код :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "Перервано" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "Помилки:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "Помилка:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "Успіх" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "Командний рядок :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "Збережені додаткові нетипові дані : %d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "Результат виконання операції:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "Змінено пакунків:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "Пропущено пакунків:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Проблеми з rpmdb:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Виведено скриптом:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "Помилки:" @@ -126371,17 +129295,17 @@ index f5a658d..bb96267 100644 -msgstr "Встановити" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "Встановлення з залежностями" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "Робить застарілим" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "Стерти" @@ -126394,297 +129318,311 @@ index f5a658d..bb96267 100644 -msgstr "Понизити" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "Оновити" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "Час" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "Протягом дня" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "Попереднього тижня" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "Попередні 2 тижні" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "Попередні 3 місяці" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "Попередні 6 місяців" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "Попередній рік" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "Понад рік тому" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "Не знайдено операції %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "Ід. операції :" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "Доступні додаткові дані з журналу:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: для цієї назви додаткових даних не знайдено" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "Пакунок :" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "Стан :" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "Розмір :" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "Вузол збирання :" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "Час збирання :" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "Пакувальник :" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "Постачальник :" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "Ліцензія :" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "Адреса :" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "RPM з кодом :" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "Час надсилання :" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "Автор внеску :" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "Причина :" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "Зі сховища :" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "Встановлено :" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "Автор змін :" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" -msgstr "встановлення" +msgstr "встановлено" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "оновленням" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "вилучено" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "перевстановлено" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "зниженням версії" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "робити застарілим" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "оновлено" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "визнано застарілим" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "---> Пакунок %s.%s %s:%s-%s буде %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> Виконання перевірки операції" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> Перезапускається визначення залежностей з урахуванням змін." -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> Визначення залежностей завершено" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> Обробка залежності: %s для пакунка: %s" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> Збережено пакунок: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> Нерозв'язана залежність: %s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "Пакунок: %s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1331,7 +1429,7 @@ msgstr "" - "\n" - " Потребує: %s" + " Requires: %s" +-msgstr "" +-"\n" +-" Потребує: %s" ++msgstr "\n Потребує: %s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1340,7 +1438,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1349,7 +1447,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1358,85 +1456,85 @@ msgstr "" - " Не знайдено" +-msgstr "" +-"\n" +-" Не знайдено" ++msgstr "\n Не знайдено" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "Оновлено" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "Знижено версію" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "Став застарілим" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "Наявні" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> Обробка конфлікту: %s конфліктів %s" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> Додавання вибраних пакунків до операції. Зачекайте, будь ласка." -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> У список операцій звантажується заголовок пакунка %s." -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "Перевірка" ++ +#: ../utils.py:129 msgid "Running" msgstr "Виконання" @@ -126710,7 +129648,7 @@ index f5a658d..bb96267 100644 msgstr "З трасуванням/зупинкою" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "Невідомо" @@ -126748,36 +129686,47 @@ index f5a658d..bb96267 100644 msgid "" "\n" "\n" -@@ -1446,7 +1544,7 @@ msgstr "" - "\n" - "Завершення роботи на запит користувача" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"Завершення роботи на запит користувача" ++msgstr "\n\nЗавершення роботи на запит користувача" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1456,7 +1554,7 @@ msgstr "" - "\n" - "Завершення роботи через розрив зв’язку" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"Завершення роботи через розрив зв’язку" ++msgstr "\n\nЗавершення роботи через розрив зв’язку" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1467,7 +1565,7 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" -@@ -1475,35 +1573,35 @@ msgstr "" - "Зараз yum блокує стороння програма. Завершуємо роботу відповідно до " - "налаштування exit_on_lock" +-msgstr "" +-"Зараз yum блокує стороння програма. Завершуємо роботу відповідно до " +-"налаштування exit_on_lock" ++msgstr "Зараз yum блокує стороння програма. Завершуємо роботу відповідно до налаштування exit_on_lock" -#: ../utils.py:287 +#: ../utils.py:352 @@ -126818,27 +129767,50 @@ index f5a658d..bb96267 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1511,7 +1609,7 @@ msgstr "" - "\n" - "Залежності розв’язано" +-msgstr "" +-"\n" +-"Залежності розв’язано" ++msgstr "\nЗалежності розв’язано" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 msgid "Complete!" msgstr "Завершено!" -@@ -1525,7 +1623,7 @@ msgstr "" - "Для виконання цієї команди вам слід набути прав доступу адміністративного " - "користувача." +@@ -1521,11 +1573,9 @@ msgstr " Коротко щодо використання:\n" + + #: ../yumcommands.py:52 + msgid "You need to be root to perform this command." +-msgstr "" +-"Для виконання цієї команди вам слід набути прав доступу адміністративного " +-"користувача." ++msgstr "Для виконання цієї команди вам слід набути прав доступу адміністративного користувача." -#: ../yumcommands.py:59 +#: ../yumcommands.py:65 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1556,53 +1654,53 @@ msgstr "" - "Докладніші відомості може бути отримано з довідки до вашого дистрибутива або від\n" - "постачальника пакунків.\n" +@@ -1540,479 +1590,482 @@ msgid "" + "will install it for you.\n" + "\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"Вами було увімкнено перевірку пакунків за допомогою ключів GPG. Це правильний крок. \n" +-"Але у вашій системі не встановлено жодного відкритого ключа GPG. Вам слід звантажити\n" +-"ключі до пакунків, які ви бажаєте встановити і встановити ці ключі.\n" +-"Виконати встановлення можна за допомогою команди:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"Крім того, ви можете вказати адресу URL ключа, яким бажаєте скористатися\n" +-"для сховища за допомогою параметра «gpgkey» у розділі налаштувань сховища, yum \n" +-"встановить потрібні ключі автоматично.\n" +-"\n" +-"Докладніші відомості може бути отримано з довідки до вашого дистрибутива або від\n" +-"постачальника пакунків.\n" ++msgstr "\nВами було увімкнено перевірку пакунків за допомогою ключів GPG. Це правильний крок. \nАле у вашій системі не встановлено жодного відкритого ключа GPG. Вам слід звантажити\nключі до пакунків, які ви бажаєте встановити і встановити ці ключі.\nВиконати встановлення можна за допомогою команди:\n rpm --import public.gpg.key\n\n\nКрім того, ви можете вказати адресу URL ключа, яким бажаєте скористатися\nдля сховища за допомогою параметра «gpgkey» у розділі налаштувань сховища, yum \nвстановить потрібні ключі автоматично.\n\nДокладніші відомості може бути отримано з довідки до вашого дистрибутива або від\nпостачальника пакунків.\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -126902,9 +129874,12 @@ index f5a658d..bb96267 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1612,309 +1710,298 @@ msgstr "" - " Для перегляду списку всіх сховищ віддайте команду «yum repolist all».\n" - " Увімкнути сховище можна за допомогою команди yum-config-manager --enable " + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"Не увімкнено жодного сховища.\n" +-" Для перегляду списку всіх сховищ віддайте команду «yum repolist all».\n" +-" Увімкнути сховище можна за допомогою команди yum-config-manager --enable " ++msgstr "Не увімкнено жодного сховища.\n Для перегляду списку всіх сховищ віддайте команду «yum repolist all».\n Увімкнути сховище можна за допомогою команди yum-config-manager --enable " -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -126939,8 +129914,9 @@ index f5a658d..bb96267 100644 -#: ../yumcommands.py:248 +#: ../yumcommands.py:430 msgid "Synchronize installed packages to the latest available versions" - msgstr "" - "Синхронізація встановлених пакунків з найсвіжішими доступними версіями" +-msgstr "" +-"Синхронізація встановлених пакунків з найсвіжішими доступними версіями" ++msgstr "Синхронізація встановлених пакунків з найсвіжішими доступними версіями" -#: ../yumcommands.py:256 +#: ../yumcommands.py:459 @@ -127050,9 +130026,10 @@ index f5a658d..bb96267 100644 -#: ../yumcommands.py:557 +#: ../yumcommands.py:956 msgid "This may take a while depending on the speed of this computer" - msgstr "" - "Процедура може тривати досить довго, тривалість залежить від потужності " - "комп’ютера." +-msgstr "" +-"Процедура може тривати досить довго, тривалість залежить від потужності " +-"комп’ютера." ++msgstr "Процедура може тривати досить довго, тривалість залежить від потужності комп’ютера." -#: ../yumcommands.py:578 +#: ../yumcommands.py:977 @@ -127139,120 +130116,120 @@ index f5a658d..bb96267 100644 msgstr "Показ списку увімкнених сховищ програмного забезпечення" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "увімкнено" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "вимкнено" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "Ід. сховища : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "Назва сховища : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "Стан сховища : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "Версія сховища: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "Мітки сховища : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "Мітки дистрибутива сховища: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "Оновлення сховища: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "Пакунки сховища: " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "Розмір сховища: " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "Адреса сховища: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "Метапосилання сховища: " -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr " Оновлено : " -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "Дзеркала сховищ: " -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "Ніколи (востаннє: %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "Негайно (лишилося: %s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s секунд (лишилося: %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "Строк дії сховища: " -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "Виключення сховища: " -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "Включення сховища: " -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "Виключені сховища: " -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "Назва файла сховища: " @@ -127260,204 +130237,209 @@ index f5a658d..bb96267 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "ід. сховища" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "стан" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "назва сховища" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "Показати корисну підказку щодо використання" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "Довідки щодо %s не виявлено" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1924,7 +2011,7 @@ msgstr "" - "\n" - "інші назви: " + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"інші назви: " ++msgstr "\n\nінші назви: " -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1934,85 +2021,125 @@ msgstr "" - "\n" - "інша назва: " + "alias: " +-msgstr "" +-"\n" +-"\n" +-"інша назва: " ++msgstr "\n\nінша назва: " -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "Налаштування процесу перевстановлення" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "перевстановлення пакунка" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "Налаштування процесу зниження версії" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "зниження версії пакунка" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "Показ версії для вашої архітектури і/або списку доступних сховищ." -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Групи версій Yum:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " Група :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " Пакунки:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "Встановлено:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "Встановлені групи:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "Доступні:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "Доступні групи:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "Показ або використання журналу операцій" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "Операції:" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "Час початку :" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "Час закінч. :" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "Лічильники :" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr " NEVRAC :" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr " NEVRA :" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr " NA :" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr " NEVR :" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr " rpm DB :" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr " yum DB :" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "Некоректна підкоманда журналу, скористайтеся: %s." -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "У вас немає права доступу до бази даних журналу." -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "Пошук проблем у rpmdb" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "завантажити збережену операцію з файла з вказаною назвою" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "Не вказано файла збережених записів операцій" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "завантаження операції з %s" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "Операцію завантажено з %s, кількість дій — %s" -@@ -2023,29 +2150,37 @@ msgstr "Операцію завантажено з %s, кількість дій +@@ -2023,106 +2076,106 @@ msgstr "Операцію завантажено з %s, кількість дій msgid " Yum checks failed: %s" msgstr " Спроба перевірки yum зазнала невдачі: %s" -#: ../yummain.py:114 -msgid "" -"Another app is currently holding the yum lock; waiting for it to exit..." +-msgstr "" +-"Зараз yum блокує стороння програма. Зачекаємо на завершення її роботи..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" - msgstr "" --"Зараз yum блокує стороння програма. Зачекаємо на завершення її роботи..." -+"Немає доступу до читання або виконання до поточного каталогу, пересуваємо до" -+" /" ++msgstr "Немає доступу до читання або виконання до поточного каталогу, пересуваємо до /" -#: ../yummain.py:120 +#: ../yummain.py:124 @@ -127467,8 +130449,7 @@ index f5a658d..bb96267 100644 +#: ../yummain.py:128 +msgid "" +"Another app is currently holding the yum lock; waiting for it to exit..." -+msgstr "" -+"Зараз yum блокує стороння програма. Зачекаємо на завершення її роботи..." ++msgstr "Зараз yum блокує стороння програма. Зачекаємо на завершення її роботи..." + #. Depsolve stage -#: ../yummain.py:167 @@ -127480,293 +130461,299 @@ index f5a658d..bb96267 100644 +#: ../yummain.py:241 ../yummain.py:249 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" -+msgid "" -+"Your transaction was saved, rerun it with:\n" -+" yum load-transaction %s" - msgstr "" +-msgstr "" -"Ваш запис операції було збережено, повторити операцію можна за допомогою " -"команди: yum load-transaction %s" -+"Ваш запис операції було збережено, повторити операцію можна за допомогою\n" ++msgid "" ++"Your transaction was saved, rerun it with:\n" +" yum load-transaction %s" ++msgstr "Ваш запис операції було збережено, повторити операцію можна за допомогою\n yum load-transaction %s" -#: ../yummain.py:288 +#: ../yummain.py:326 msgid "" "\n" "\n" -@@ -2055,74 +2190,74 @@ msgstr "" - "\n" - "Завершення роботи на запит користувача." + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"Завершення роботи на запит користувача." ++msgstr "\n\nЗавершення роботи на запит користувача." -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() буде усунуто у майбутніх версіях Yum.\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "Налаштування наборів операцій до включення класу налаштувань" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "Некоректне значення tsflag у файлі налаштувань: %s" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "Пошук pkgSack для залежності: %s" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "Частина: %s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s перетворено для встановлення" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "Додавання пакунка %s у режимі %s" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "Вилучення пакунка %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s потребує: %s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s потребує %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "Потрібний пакунок вже знайдено, обхідний маневр" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "Потрібна залежність задана не яка назва пакунка. Шукаємо: %s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "Можливе джерело залежності: %s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "Режим %s для надання %s: %s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "Режим надання пакунка %s: %s" -@@ -2130,117 +2265,117 @@ msgstr "Режим надання пакунка %s: %s" +@@ -2130,1044 +2183,1031 @@ msgstr "Режим надання пакунка %s: %s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "Спроба оновлення %s з метою розв’язання залежностей" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "Не знайдено шляхів оновлення %s. Помилка!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "TSINFO: пакунок %s, потрібний для %s, позначено для вилучення" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." - msgstr "" - "TSINFO: %s стає застарілим після встановлення %s для розв’язання " - "залежностей." +-msgstr "" +-"TSINFO: %s стає застарілим після встановлення %s для розв’язання " +-"залежностей." ++msgstr "TSINFO: %s стає застарілим після встановлення %s для розв’язання залежностей." -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "TSINFO: оновлення %s для розв’язання залежностей." -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "Не вдалося знайти шлях оновлення для залежності %s" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "Встановлено швидку відповідність %s пакунку потрібному для пакунка %s" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." - msgstr "" - "%s належить до списку супутніх пакунків, його вже встановлено, пропускаємо." +-msgstr "" +-"%s належить до списку супутніх пакунків, його вже встановлено, пропускаємо." ++msgstr "%s належить до списку супутніх пакунків, його вже встановлено, пропускаємо." -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "Потенційний пакунок розв’язання %s має новішу версію у ts." -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "Встановлено новішу версію потенційного пакунка розв’язання %s." -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s вже перебуває у списку, пропускаємо його" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "TSINFO: позначення %s як оновлення для %s" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "TSINFO: позначення %s як такий, який слід встановити для %s" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "Успіх — порожня операція" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "Перезапуск циклу" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "Завершення процесу розв’язання залежностей" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "Успіх — залежності розв’язано" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "Перевірка залежностей для %s" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "пошук %s, потрібного для %s" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "Виконання compare_providers() для %s" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "краща архітектура у po %s" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s робить застарілим %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2249,144 +2384,144 @@ msgstr "" - "archdist порівняно %s з %s у %s\n" - " Кращий варіант: %s" + " Winner: %s" +-msgstr "" +-"archdist порівняно %s з %s у %s\n" +-" Кращий варіант: %s" ++msgstr "archdist порівняно %s з %s у %s\n Кращий варіант: %s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "загальний sourcerpm %s і %s" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "базовий пакунок %s встановлено для %s" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "загальний префікс %s для %s і %s" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "мінімальна вимога: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " Переможець: %s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " Невдаха(з %d): %s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "Найкращий порядок: %s" @@ -127786,9 +130773,10 @@ index f5a658d..bb96267 100644 +#: ../yum/__init__.py:533 #, python-format msgid "Repository %r is missing name in configuration, using id" - msgstr "" - "Для сховища %r у налаштуваннях не вказано назви, використовуємо " - "ідентифікатор" +-msgstr "" +-"Для сховища %r у налаштуваннях не вказано назви, використовуємо " +-"ідентифікатор" ++msgstr "Для сховища %r у налаштуваннях не вказано назви, використовуємо ідентифікатор" -#: ../yum/__init__.py:526 +#: ../yum/__init__.py:571 @@ -127901,9 +130889,10 @@ index f5a658d..bb96267 100644 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." -@@ -2394,21 +2529,21 @@ msgstr "" - "Залишилися незавершені операції. Для їх завершення вам слід спочатку " - "запустити yum-complete-transaction." +-msgstr "" +-"Залишилися незавершені операції. Для їх завершення вам слід спочатку " +-"запустити yum-complete-transaction." ++msgstr "Залишилися незавершені операції. Для їх завершення вам слід спочатку запустити yum-complete-transaction." -#: ../yum/__init__.py:983 +#: ../yum/__init__.py:1067 @@ -127927,9 +130916,10 @@ index f5a658d..bb96267 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2416,90 +2551,93 @@ msgstr "" - "\n" - "Пакунки, пропущені через проблеми з залежностями:" +-msgstr "" +-"\n" +-"Пакунки, пропущені через проблеми з залежностями:" ++msgstr "\nПакунки, пропущені через проблеми з залежностями:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -127942,9 +130932,10 @@ index f5a658d..bb96267 100644 +#: ../yum/__init__.py:1477 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" - msgstr "" - "** Знайдено %d проблем rpmdb, які вже існували, командою «yum check» " - "виведено такі дані:" +-msgstr "" +-"** Знайдено %d проблем rpmdb, які вже існували, командою «yum check» " +-"виведено такі дані:" ++msgstr "** Знайдено %d проблем rpmdb, які вже існували, командою «yum check» виведено такі дані:" -#: ../yum/__init__.py:1395 +#: ../yum/__init__.py:1481 @@ -127965,9 +130956,10 @@ index f5a658d..bb96267 100644 +#: ../yum/__init__.py:1630 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." - msgstr "" - "Попередження: під час виконання операції сталися помилки виконання скриптів " - "та інші некритичні помилки." +-msgstr "" +-"Попередження: під час виконання операції сталися помилки виконання скриптів " +-"та інші некритичні помилки." ++msgstr "Попередження: під час виконання операції сталися помилки виконання скриптів та інші некритичні помилки." -#: ../yum/__init__.py:1535 +#: ../yum/__init__.py:1640 @@ -127989,7 +130981,7 @@ index f5a658d..bb96267 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s мало бути встановлено, але цю дію не було виконано!" @@ -128000,24 +130992,22 @@ index f5a658d..bb96267 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s мало бути вилучено, але цього не сталося!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "Не вдалося вилучити блокування %s: %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "Не вдалося вилучити блокування %s: %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "Не вдалося перевірити, чи є активним PID %s" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "Не вдалося перевірити, чи є активним PID %s" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -128027,38 +131017,52 @@ index f5a658d..bb96267 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "Не вдалося створити блокування %s: %s " -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "Не вдалося вилучити блокування %s: %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "Не вдалося перевірити, чи є активним PID %s" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " -@@ -2508,40 +2646,29 @@ msgstr "" - "Пакунок не відповідає тому, який програма має намір звантажити. Пропозиція: " - "віддайте команду yum -enablerepo=%s clean metadata" + "--enablerepo=%s clean metadata" +-msgstr "" +-"Пакунок не відповідає тому, який програма має намір звантажити. Пропозиція: " +-"віддайте команду yum -enablerepo=%s clean metadata" ++msgstr "Пакунок не відповідає тому, який програма має намір звантажити. Пропозиція: віддайте команду yum -enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "Не вдалося перевірити контрольну суму" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "Контрольна сума пакунка не збігається з еталонною" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "контрольна сума пакунка не збігається, кешування для %s увімкнено" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "використано локальну копію %s" @@ -128075,69 +131079,70 @@ index f5a658d..bb96267 100644 -" * потрібно %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "Заголовок не завершено." -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" -@@ -2549,62 +2676,65 @@ msgstr "" - "Заголовка немає у локальному кеші, увімкнено режим «лише кешування». Не " - "вдалося звантажити %s" +-msgstr "" +-"Заголовка немає у локальному кеші, увімкнено режим «лише кешування». Не " +-"вдалося звантажити %s" ++msgstr "Заголовка немає у локальному кеші, увімкнено режим «лише кешування». Не вдалося звантажити %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "Відкритий ключ для %s не встановлено" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "Проблеми з відкриттям пакунка %s" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "Відкритий ключ %s не є надійним" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "Пакунок %s не підписано" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "Не вдалося вилучити %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s вилучено" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "Не вдалося вилучити файл %s, %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "Файл %s, %s, вилучено" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "Вилучено %d файлів %s" @@ -128148,28 +131153,29 @@ index f5a658d..bb96267 100644 +msgstr[2] "Вилучено %d файлів %s" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "У наборі для %s знайдено декілька ідентичних відповідників" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "Немає відповідників %s.%s %s:%s-%s з оновлення" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" -@@ -2612,121 +2742,125 @@ msgstr "" - "searchPackages() буде усунуто у майбутніх версіях Yum. " - "Використовуйте краще searchGenerator(). \n" +-msgstr "" +-"searchPackages() буде усунуто у майбутніх версіях Yum. " +-"Використовуйте краще searchGenerator(). \n" ++msgstr "searchPackages() буде усунуто у майбутніх версіях Yum. Використовуйте краще searchGenerator(). \n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "Пошук %d пакунків" @@ -128180,62 +131186,62 @@ index f5a658d..bb96267 100644 +msgstr[2] "Пошук %d пакунків" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "пошук пакунка %s" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "пошук серед файлів" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "пошук у супутніх записах" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "Для налаштованих сховищ дані груп недоступні" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "Групи з назвою %s не існує" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "пакунок %s було позначено у групі %s" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "Додавання пакунка %s з групи %s" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "Не вдалося знайти пакунок з назвою %s для встановлення" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "Попередження: у групі %s немає жодного пакунка." -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "У групі %s %u необов’язкових пакунки, які може бути встановлено." @@ -128243,145 +131249,148 @@ index f5a658d..bb96267 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "У наборі пакунків не вдалося знайти кортеж пакунків %s" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "У базі даних RPM не вдалося знайти кортеж пакунків %s" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "Некоректний прапорець версії від: %s" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "Пакунків з %s не знайдено" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "Об’єкт пакунка не був екземпляром об’єкта пакунка" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "Список встановлення порожній" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "Пошук віртуальних супутніх пакунків або файлів для %s" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "Відповідника параметра не знайдено: %s" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "Пакунок %s вже встановлено, його не можна позначити" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "Немає доступних для встановлення пакунків" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "Пакунок: %s — вже у наборі операцій" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "Пакунок %s став застарілим після встановлення %s" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " -@@ -2735,97 +2869,103 @@ msgstr "" - "Пакунок %s став застарілим після встановлення %s, але застарілий пакунок не " - "містить вимог до інших пакунків" + "requirements" +-msgstr "" +-"Пакунок %s став застарілим після встановлення %s, але застарілий пакунок не " +-"містить вимог до інших пакунків" ++msgstr "Пакунок %s став застарілим після встановлення %s, але застарілий пакунок не містить вимог до інших пакунків" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" - msgstr "" - "Пакунок %s став застарілим після встановлення %s, спробуємо встановити " - "замість нього %s" +-msgstr "" +-"Пакунок %s став застарілим після встановлення %s, спробуємо встановити " +-"замість нього %s" ++msgstr "Пакунок %s став застарілим після встановлення %s, спробуємо встановити замість нього %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "Пакунок %s вже встановлено, його версія є найсвіжішою" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "Відповідник пакунка %s вже встановлено. Перевірка існування оновлень." #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "Повне оновлення" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "Неоновлюваний пакунок, який вже застарів: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "Відповідного пакунка для оновлення не знайдено: %s" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "Пакунок вже застарілий: %s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "Неоновлюваний пакунок, який застарів: %s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "Неоновлюваний пакунок, який було оновлено раніше: %s.%s %s:%s-%s" @@ -128389,411 +131398,420 @@ index f5a658d..bb96267 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "Відповідного пакунка для вилучення не знайдено" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "Відповідного пакунка для вилучення не знайдено: %s" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "Пропущено поточне робоче ядро: %s" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "Вилучення %s з запису операції" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "Не вдалося відкрити: %s. Пропускаємо." -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "Перевірка %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "Не вдалося виконати локальне встановлення deltarpm: %s. Пропущено." -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "Не вдалося додати пакунок %s до операції. Несумісна архітектура: %s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" - msgstr "" - "Не вдалося встановити пакунок %s. Він є застарілим після встановлення " - "пакунка %s" +-msgstr "" +-"Не вдалося встановити пакунок %s. Він є застарілим після встановлення " +-"пакунка %s" ++msgstr "Не вдалося встановити пакунок %s. Він є застарілим після встановлення пакунка %s" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " -@@ -2834,7 +2974,7 @@ msgstr "" - "Пакунок %s не встановлено, не вдалося оновити його. Віддайте команду yum " - "install, щоб встановити цей пакунок." + "instead." +-msgstr "" +-"Пакунок %s не встановлено, не вдалося оновити його. Віддайте команду yum " +-"install, щоб встановити цей пакунок." ++msgstr "Пакунок %s не встановлено, не вдалося оновити його. Віддайте команду yum install, щоб встановити цей пакунок." -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" -@@ -2843,140 +2983,149 @@ msgstr "" - "Пакунок %s.%s не встановлено, його не можна оновити. Вам слід скористатися " - "командою «yum install» для його встановлення." + " instead." +-msgstr "" +-"Пакунок %s.%s не встановлено, його не можна оновити. Вам слід скористатися " +-"командою «yum install» для його встановлення." ++msgstr "Пакунок %s.%s не встановлено, його не можна оновити. Вам слід скористатися командою «yum install» для його встановлення." -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "Виключення %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "Позначення %s для встановлення" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "Позначення %s як оновлення %s" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s: не оновлює встановлений пакунок." -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "Не вдалося відкрити файл %s. Пропускаємо." -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "Проблема з перевстановленням: не виявлено пакунків для вилучення" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" - msgstr "" - "Проблема з перевстановленням: не виявлено відповідного пакунка %s для " - "встановлення" +-msgstr "" +-"Проблема з перевстановленням: не виявлено відповідного пакунка %s для " +-"встановлення" ++msgstr "Проблема з перевстановленням: не виявлено відповідного пакунка %s для встановлення" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "Немає доступних для зниження версії пакунків" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" - msgstr "" - "Пакунок %s можна встановлювати паралельно з іншими версіями, пропускаємо" +-msgstr "" +-"Пакунок %s можна встановлювати паралельно з іншими версіями, пропускаємо" ++msgstr "Пакунок %s можна встановлювати паралельно з іншими версіями, пропускаємо" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "Немає відповідників для доступного пакунка: %s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "Для пакунка доступне лише оновлення: %s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "Не вдалося знизити версію: %s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "Не вдалося оновити: %s" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "Отримання ключа з %s" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "Невдала спроба отримання ключа GPG: " #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "Ключ підпису GPG ключа %s не збігається з ключем CA сховища: %s" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "Перевірено відповідність підпису ключа GPG ключам CA" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "Некоректний ключ GPG з %s: %s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "Помилка обробник ключа GPG: у ключі немає значення %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid : %s\n" -" Package: %s (%s)\n" -" From : %s" +-msgstr "" +-"Імпортування ключа %s 0x%s:\n" +-" Ідентифікатор: «%s»\n" +-" Пакунок : %s (%s)\n" +-" Джерело : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" Package : %s (%s)\n" +" From : %s" - msgstr "" - "Імпортування ключа %s 0x%s:\n" --" Ідентифікатор: «%s»\n" --" Пакунок : %s (%s)\n" --" Джерело : %s" -+" Ід. корист.: «%s»\n" -+" Відбиток : %s\n" -+" Пакунок : %s (%s)\n" -+" Походження : %s" ++msgstr "Імпортування ключа %s 0x%s:\n Ід. корист.: «%s»\n Відбиток : %s\n Пакунок : %s (%s)\n Походження : %s" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" -" Userid: \"%s\"\n" -" From : %s" +-msgstr "" +-"Імпортування ключа %s 0x%s:\n" +-" Ідентифікатор: «%s»\n" +-" Джерело : %s" +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" - msgstr "" - "Імпортування ключа %s 0x%s:\n" --" Ідентифікатор: «%s»\n" --" Джерело : %s" -+" Ід. корист.: «%s»\n" -+" Відбиток : %s\n" -+" Походження : %s" ++msgstr "Імпортування ключа %s 0x%s:\n Ід. корист.: «%s»\n Відбиток : %s\n Походження : %s" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "Ключ GPG у %s (0x%s) вже встановлено" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "Помилка імпортування ключа (код %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "Ключ успішно імпортовано" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "Не встановлено жодного ключа" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" -@@ -2985,25 +3134,25 @@ msgstr "" - "Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними для цього пакунка.\n" - "Перевірте, чи правильно вказано адреси URL для цього сховища." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними для цього пакунка.\n" +-"Перевірте, чи правильно вказано адреси URL для цього сховища." ++msgstr "Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними для цього пакунка.\nПеревірте, чи правильно вказано адреси URL для цього сховища." -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "Імпортування ключів не допомогло, помилкові ключі?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "Ключ GPG у %s (0x%s) вже імпортовано" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "Помилка імпортування ключа" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "Не встановлено жодного ключа для сховища %s" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -3012,162 +3161,186 @@ msgstr "" - "Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними.\n" - "Перевірте, чи правильно вказано адреси URL для цього сховища." + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними.\n" +-"Перевірте, чи правильно вказано адреси URL для цього сховища." ++msgstr "Ключі GPG зі списку сховища «%s» вже встановлено, але вони є некоректними.\nПеревірте, чи правильно вказано адреси URL для цього сховища." -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "Не вдалося знайти відповідного дзеркала." -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "Під час спроби звантаження пакунків сталися помилки." -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "Повідомте про цю помилку за адресою %s" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "Помилки під час тестування: " -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "Не вдалося визначити теку кешування: %s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." - msgstr "" - "Залежності не розв’язано. Запис операції з нерозв’язаними залежностями не " - "буде збережено." +-msgstr "" +-"Залежності не розв’язано. Запис операції з нерозв’язаними залежностями не " +-"буде збережено." ++msgstr "Залежності не розв’язано. Запис операції з нерозв’язаними залежностями не буде збережено." -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "Не вдалося зберегти файл операцій %s: %s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" - msgstr "" - "Не вдалося отримати доступ або прочитати збережений запис операції %s: %s" +-msgstr "" +-"Не вдалося отримати доступ або прочитати збережений запис операції %s: %s" ++msgstr "Не вдалося отримати доступ або прочитати збережений запис операції %s: %s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "версія rpmdb не відповідає збереженим даним щодо версії у операції, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr " ігнорується у відповідь на запит." -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr " завершення роботи." -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "не вдалося знайти tsflags або tsflags не є цілим числом." -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "Знайдено txmbr у невідомому поточному стані: %s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "Не вдалося знайти txmbr: %s у стані %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "Не вдалося знайти txmbr: %s з джерела: %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "Не вистачає дій операції, зв’язків або ts було змінено," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" - msgstr "" - " ігнорується у відповідь на запит. Вам слід повторно виконати розв’язання " - "залежностей!" - +-msgstr "" +-" ігнорується у відповідь на запит. Вам слід повторно виконати розв’язання " +-"залежностей!" ++msgstr " ігнорується у відповідь на запит. Вам слід повторно виконати розв’язання залежностей!" ++ +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "%s вже було перевірено, його не можна вилучати." + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "Перевірка залежностей версій %s" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "%s має залежність від версії %s, яку було встановлено користувачем." + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "%s немає залежностей від версій, встановлених користувачем." -+ + #. Mostly copied from YumOutput._outKeyValFill() -#: ../yum/plugins.py:209 +#: ../yum/plugins.py:212 @@ -128889,29 +131907,48 @@ index f5a658d..bb96267 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s містить %s, але його не вдалося знайти" -@@ -3176,6 +3349,17 @@ msgstr "%s містить %s, але його не вдалося знайти" +@@ -3176,6 +3216,19 @@ msgstr "%s містить %s, але його не вдалося знайти" msgid "Repackaging" msgstr "Перепакування" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "Перевірка: %u/%u: %s" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"Недостатньо місця у каталозі для звантажень %s\n" -+" * вільно %s\n" -+" * потрібно %s" ++msgstr "Недостатньо місця у каталозі для звантажень %s\n * вільно %s\n * потрібно %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3188,9 +3241,7 @@ msgstr "RPM %s не пройшов перевірки на md5" + + #: ../rpmUtils/oldUtils.py:151 + msgid "Could not open RPM database for reading. Perhaps it is already in use?" +-msgstr "" +-"Не вдалося відкрити базу даних RPM для читання. Можливо, цю базу вже " +-"використовує інша програма?" ++msgstr "Не вдалося відкрити базу даних RPM для читання. Можливо, цю базу вже використовує інша програма?" + + #: ../rpmUtils/oldUtils.py:183 + msgid "Got an empty Header, something has gone wrong" +@@ -3206,5 +3257,3 @@ msgstr "Пошкоджений заголовок %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "Помилка під час відкриття rpm %s — помилка %s" +- +- diff --git a/po/ur.po b/po/ur.po -index 40bd619..7c958d8 100644 +index 40bd619..44370f7 100644 --- a/po/ur.po +++ b/po/ur.po -@@ -2,13 +2,14 @@ +@@ -2,427 +2,453 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -128919,22 +131956,24 @@ index 40bd619..7c958d8 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Urdu (http://www.transifex.net/projects/p/yum/team/ur/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Urdu (http://www.transifex.net/projects/p/yum/team/ur/)\n" ++"Language-Team: Urdu (http://www.transifex.net/projects/p/yum/language/ur/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,413 +17,438 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -128945,31 +131984,31 @@ index 40bd619..7c958d8 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -128996,7 +132035,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -129006,69 +132045,69 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -129079,98 +132118,98 @@ index 40bd619..7c958d8 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -129178,7 +132217,7 @@ index 40bd619..7c958d8 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -129187,13 +132226,13 @@ index 40bd619..7c958d8 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -129203,12 +132242,12 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -129218,12 +132257,12 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -129233,14 +132272,14 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -129248,13 +132287,13 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -129262,7 +132301,7 @@ index 40bd619..7c958d8 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -129270,151 +132309,151 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -129424,18 +132463,18 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -129445,37 +132484,37 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -129484,353 +132523,353 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -129838,157 +132877,157 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -129996,33 +133035,33 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -130033,77 +133072,77 @@ index 40bd619..7c958d8 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -130112,271 +133151,271 @@ index 40bd619..7c958d8 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +968,536 @@ msgid "" +@@ -935,484 +968,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -130385,17 +133424,17 @@ index 40bd619..7c958d8 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -130408,224 +133447,224 @@ index 40bd619..7c958d8 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -130633,7 +133672,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -130641,7 +133680,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -130649,7 +133688,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -130657,43 +133696,49 @@ index 40bd619..7c958d8 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -130719,7 +133764,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -130773,7 +133818,7 @@ index 40bd619..7c958d8 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1505,47 @@ msgid "" +@@ -1420,47 +1511,47 @@ msgid "" "%s" msgstr "" @@ -130830,7 +133875,7 @@ index 40bd619..7c958d8 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1557,7 @@ msgstr "" +@@ -1472,7 +1563,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -130839,7 +133884,7 @@ index 40bd619..7c958d8 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1574,480 @@ msgid "" +@@ -1489,451 +1580,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -131009,14 +134054,14 @@ index 40bd619..7c958d8 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -131136,153 +134181,153 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -131290,7 +134335,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -131298,148 +134343,148 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2058,106 @@ msgstr "" +@@ -1944,100 +2064,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -131484,226 +134529,226 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2165,1028 @@ msgstr "" +@@ -2045,991 +2171,1029 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -131711,43 +134756,43 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -131960,7 +135005,7 @@ index 40bd619..7c958d8 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -131971,40 +135016,46 @@ index 40bd619..7c958d8 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -132012,23 +135063,23 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -132042,67 +135093,67 @@ index 40bd619..7c958d8 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -132112,26 +135163,26 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -132141,62 +135192,62 @@ index 40bd619..7c958d8 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -132204,79 +135255,79 @@ index 40bd619..7c958d8 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -132284,118 +135335,118 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -132403,7 +135454,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -132411,118 +135462,118 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -132536,7 +135587,7 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -132548,29 +135599,29 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -132578,29 +135629,29 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -132608,117 +135659,117 @@ index 40bd619..7c958d8 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -132818,10 +135869,15 @@ index 40bd619..7c958d8 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3195,14 @@ msgstr "" +@@ -3038,6 +3202,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -132833,8 +135889,14 @@ index 40bd619..7c958d8 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3243,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/po/yum.pot b/po/yum.pot -index 97ae91a..15ddd8d 100644 +index 97ae91a..b77afa5 100644 --- a/po/yum.pot +++ b/po/yum.pot @@ -8,7 +8,7 @@ msgid "" @@ -132842,18 +135904,18 @@ index 97ae91a..15ddd8d 100644 "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -+"POT-Creation-Date: 2011-12-02 15:59-0500\n" ++"POT-Creation-Date: 2012-03-01 16:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -@@ -16,415 +16,441 @@ msgstr "" +@@ -16,415 +16,443 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1440 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -132864,31 +135926,31 @@ index 97ae91a..15ddd8d 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 -+#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1439 ++#: ../output.py:2854 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2312 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 ++#: ../callback.py:51 ../output.py:1608 ../output.py:2155 ../output.py:2319 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2081 ++#: ../callback.py:52 ../output.py:2154 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 -+#: ../output.py:2081 ../output.py:2083 ../output.py:2754 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1606 ++#: ../output.py:2154 ../output.py:2156 ../output.py:2826 msgid "Installed" msgstr "" @@ -132915,7 +135977,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1368 ../output.py:2757 ++#: ../callback.py:229 ../output.py:1441 ../output.py:2829 msgid "Removing" msgstr "" @@ -132947,7 +136009,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1987 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" @@ -133010,86 +136072,86 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../cli.py:497 -+#: ../cli.py:544 ++#: ../cli.py:542 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:548 ++#: ../cli.py:546 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:553 ++#: ../cli.py:551 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:572 ../yum/__init__.py:5518 ++#: ../cli.py:570 ../yum/__init__.py:5748 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:581 ../yum/__init__.py:5527 ++#: ../cli.py:579 ../yum/__init__.py:5757 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:583 ../yum/__init__.py:5530 ++#: ../cli.py:581 ../yum/__init__.py:5760 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:589 ++#: ../cli.py:587 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:590 ++#: ../cli.py:588 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:596 ++#: ../cli.py:594 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:608 ++#: ../cli.py:606 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:615 ++#: ../cli.py:613 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:647 ++#: ../cli.py:645 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:680 ++#: ../cli.py:678 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:699 ../cli.py:742 ++#: ../cli.py:697 ../cli.py:740 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:725 ../cli.py:733 ++#: ../cli.py:723 ../cli.py:731 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 ++#: ../cli.py:737 ../cli.py:835 ../cli.py:1071 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -133097,7 +136159,7 @@ index 97ae91a..15ddd8d 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:832 ++#: ../cli.py:844 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -133106,13 +136168,13 @@ index 97ae91a..15ddd8d 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 -+#: ../yumcommands.py:268 ++#: ../cli.py:847 ../cli.py:848 ../cli.py:1078 ../cli.py:1128 ../cli.py:1163 ++#: ../yumcommands.py:271 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:886 ++#: ../cli.py:897 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -133122,12 +136184,12 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:770 -+#: ../cli.py:888 ++#: ../cli.py:899 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:1000 ++#: ../cli.py:1011 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -133137,12 +136199,12 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:869 -+#: ../cli.py:1002 ++#: ../cli.py:1013 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1028 ++#: ../cli.py:1038 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -133152,14 +136214,14 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:888 -+#: ../cli.py:1030 ++#: ../cli.py:1040 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1067 ++#: ../cli.py:1077 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" @@ -133167,13 +136229,13 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:938 -+#: ../cli.py:1104 ++#: ../cli.py:1114 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1105 ++#: ../cli.py:1115 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -133181,7 +136243,7 @@ index 97ae91a..15ddd8d 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1117 ++#: ../cli.py:1127 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" @@ -133189,152 +136251,155 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:960 -+#: ../cli.py:1139 ++#: ../cli.py:1149 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1152 ++#: ../cli.py:1162 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1259 ++#: ../cli.py:1269 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1276 ++#: ../cli.py:1286 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1278 ++#: ../cli.py:1288 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1296 ++#: ../cli.py:1306 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1303 ++#: ../cli.py:1313 #, python-format msgid "" " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1307 ++#: ../cli.py:1317 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1310 ++#: ../cli.py:1320 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1414 ++#: ../cli.py:1436 #, python-format - msgid "No Package Found for %s" +-msgid "No Package Found for %s" ++msgid "" ++"Error: No Packages found for:\n" ++" %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1453 ++#: ../cli.py:1472 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1458 ++#: ../cli.py:1477 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1474 ++#: ../cli.py:1493 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1477 ++#: ../cli.py:1496 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1480 ++#: ../cli.py:1499 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1483 ++#: ../cli.py:1502 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1486 ++#: ../cli.py:1505 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1489 ++#: ../cli.py:1508 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1492 ++#: ../cli.py:1511 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1528 ++#: ../cli.py:1547 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1545 ../cli.py:1603 ++#: ../cli.py:1564 ../cli.py:1622 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1551 ../cli.py:1609 ++#: ../cli.py:1570 ../cli.py:1628 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1557 ../cli.py:1615 ++#: ../cli.py:1576 ../cli.py:1634 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1563 ../cli.py:1621 ++#: ../cli.py:1582 ../cli.py:1640 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1566 ../cli.py:1623 ++#: ../cli.py:1585 ../cli.py:1642 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 ++#: ../cli.py:1665 ../cli.py:1693 ../cli.py:1699 ../yum/__init__.py:3909 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1684 ++#: ../cli.py:1703 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1686 ++#: ../cli.py:1705 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -133344,18 +136409,18 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1706 ../yum/__init__.py:3728 ++#: ../cli.py:1725 ../yum/__init__.py:3925 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1712 ++#: ../cli.py:1731 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1714 ++#: ../cli.py:1733 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -133365,192 +136430,192 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../cli.py:1386 -+#: ../cli.py:1755 ++#: ../cli.py:1774 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1766 ++#: ../cli.py:1785 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1792 ++#: ../cli.py:1811 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1812 ++#: ../cli.py:1831 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1824 ++#: ../cli.py:1843 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1846 ++#: ../cli.py:1865 #, python-format msgid "" "\n" -@@ -432,438 +458,444 @@ msgid "" +@@ -432,438 +460,452 @@ msgid "" "%s: %s option requires an argument" msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1910 ++#: ../cli.py:1928 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1985 ++#: ../cli.py:1999 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2039 ++#: ../cli.py:2053 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2043 ++#: ../cli.py:2057 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2046 ++#: ../cli.py:2060 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2049 ++#: ../cli.py:2063 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2052 ++#: ../cli.py:2066 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2054 ++#: ../cli.py:2068 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2058 ++#: ../cli.py:2072 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2060 ++#: ../cli.py:2074 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2063 ++#: ../cli.py:2077 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2066 ++#: ../cli.py:2080 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2068 ++#: ../cli.py:2082 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2070 ++#: ../cli.py:2084 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2072 ++#: ../cli.py:2086 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2076 ++#: ../cli.py:2090 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2077 ++#: ../cli.py:2091 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2081 ++#: ../cli.py:2095 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2085 ++#: ../cli.py:2099 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2088 ++#: ../cli.py:2102 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2090 ++#: ../cli.py:2104 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2093 ++#: ../cli.py:2107 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2095 ++#: ../cli.py:2109 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2097 ++#: ../cli.py:2111 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2099 ++#: ../cli.py:2113 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2102 ++#: ../cli.py:2116 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2105 ++#: ../cli.py:2119 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2107 ++#: ../cli.py:2121 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2109 ++#: ../cli.py:2123 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2111 ++#: ../cli.py:2125 msgid "set arbitrary config and repo options" msgstr "" @@ -133656,7 +136721,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:818 ../output.py:1211 ++#: ../output.py:818 ../output.py:1267 #, python-format msgid "Repo : %s" msgstr "" @@ -133709,7 +136774,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:844 ../output.py:1227 ++#: ../output.py:844 ../output.py:1283 #, python-format msgid "URL : %s" msgstr "" @@ -133720,37 +136785,37 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:846 ../output.py:1224 ++#: ../output.py:846 ../output.py:1280 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:962 ++#: ../output.py:964 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:962 ++#: ../output.py:964 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:963 ++#: ../output.py:965 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:963 ++#: ../output.py:965 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:967 ++#: ../output.py:969 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1059 ++#: ../output.py:1092 #, python-format msgid "" "\n" @@ -133758,157 +136823,165 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1063 ++#: ../output.py:1096 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1068 ++#: ../output.py:1117 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1070 ++#: ../output.py:1119 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1072 ++#: ../output.py:1121 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1073 ++#: ../output.py:1122 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1074 ++#: ../output.py:1123 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1075 ++#: ../output.py:1124 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1099 ++#: ../output.py:1142 ++msgid " Installed Packages:" ++msgstr "" ++ ++#: ../output.py:1155 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1101 ++#: ../output.py:1157 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1106 ++#: ../output.py:1162 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1108 ++#: ../output.py:1164 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1219 ++#: ../output.py:1275 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1230 ++#: ../output.py:1286 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1233 ++#: ../output.py:1289 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1237 ++#: ../output.py:1298 ++msgid "Provides : " ++msgstr "" ++ ++#: ../output.py:1301 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1293 ++#: ../output.py:1364 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1298 ++#: ../output.py:1369 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1301 ++#: ../output.py:1371 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1305 ../output.py:1328 ++#: ../output.py:1374 ../output.py:1397 ../output.py:1401 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1324 ++#: ../output.py:1392 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1369 ++#: ../output.py:1442 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1370 ++#: ../output.py:1443 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1371 ++#: ../output.py:1444 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1372 ++#: ../output.py:1445 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1373 ++#: ../output.py:1446 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1380 ../output.py:1441 ../output.py:1537 ++#: ../output.py:1453 ../output.py:1514 ../output.py:1610 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1382 ../output.py:1442 ../output.py:2083 ++#: ../output.py:1455 ../output.py:1515 ../output.py:2156 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1383 ../output.py:1443 ++#: ../output.py:1456 ../output.py:1516 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 ++#: ../output.py:1478 ../output.py:1526 ../output.py:1542 ../output.py:2514 msgid "Package" -msgstr "" +msgid_plural "Packages" @@ -133916,387 +136989,387 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../output.py:1075 -+#: ../output.py:1405 ++#: ../output.py:1478 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1406 ++#: ../output.py:1479 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1406 ++#: ../output.py:1479 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1407 ++#: ../output.py:1480 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1419 ++#: ../output.py:1492 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1428 ++#: ../output.py:1501 #, python-format msgid "" "\n" -@@ -871,57 +903,58 @@ msgid "" +@@ -871,57 +913,58 @@ msgid "" "%s\n" msgstr "" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1433 ../output.py:2236 ../output.py:2237 ++#: ../output.py:1506 ../output.py:2309 ../output.py:2310 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1435 ++#: ../output.py:1508 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1437 ++#: ../output.py:1510 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1439 ../output.py:2242 ++#: ../output.py:1512 ../output.py:2315 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1440 ../output.py:2243 ++#: ../output.py:1513 ../output.py:2316 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1471 ++#: ../output.py:1544 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" +msgstr[1] "" + -+#: ../output.py:1531 ++#: ../output.py:1604 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1532 ++#: ../output.py:1605 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1534 ++#: ../output.py:1607 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1536 ++#: ../output.py:1609 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1538 ++#: ../output.py:1611 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1539 ++#: ../output.py:1612 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1626 ++#: ../output.py:1699 msgid "two" msgstr "" -@@ -929,7 +962,7 @@ msgstr "" +@@ -929,7 +972,7 @@ msgstr "" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1637 ++#: ../output.py:1710 #, python-format msgid "" "\n" -@@ -938,484 +971,542 @@ msgid "" +@@ -938,484 +981,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1648 ++#: ../output.py:1721 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1674 ++#: ../output.py:1747 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1696 ++#: ../output.py:1769 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1697 ++#: ../output.py:1770 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1698 ++#: ../output.py:1771 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1699 ++#: ../output.py:1772 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1700 ++#: ../output.py:1773 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1701 ++#: ../output.py:1774 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1715 ++#: ../output.py:1788 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1716 ++#: ../output.py:1789 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1785 ++#: ../output.py:1858 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1795 ../output.py:1985 ++#: ../output.py:1868 ../output.py:2058 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1820 ../output.py:2430 ../output.py:2520 ++#: ../output.py:1893 ../output.py:2503 ../output.py:2593 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1867 ++#: ../output.py:1940 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1869 ../output.py:2318 ++#: ../output.py:1942 ../output.py:2391 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1870 ../output.py:2439 ++#: ../output.py:1943 ../output.py:2512 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1872 ++#: ../output.py:1945 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1873 ../output.py:2320 ../output.py:2440 ++#: ../output.py:1946 ../output.py:2393 ../output.py:2513 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1874 ../output.py:2321 ++#: ../output.py:1947 ../output.py:2394 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1921 ++#: ../output.py:1994 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1947 ../output.py:2386 ++#: ../output.py:2020 ../output.py:2459 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1952 ++#: ../output.py:2025 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1960 ++#: ../output.py:2033 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2011 ../output.py:2394 ++#: ../output.py:2084 ../output.py:2467 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2082 ../output.py:2244 ++#: ../output.py:2155 ../output.py:2317 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2084 ++#: ../output.py:2157 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2084 ++#: ../output.py:2157 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2121 ../output.py:2123 ../output.py:2542 ++#: ../output.py:2194 ../output.py:2196 ../output.py:2614 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2125 ../output.py:2544 ++#: ../output.py:2198 ../output.py:2616 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2128 ../output.py:2130 ++#: ../output.py:2201 ../output.py:2203 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2146 ++#: ../output.py:2219 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2148 ++#: ../output.py:2221 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2150 ++#: ../output.py:2223 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2152 ++#: ../output.py:2225 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2153 ++#: ../output.py:2226 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2156 ../output.py:2158 ++#: ../output.py:2229 ../output.py:2231 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2161 ../output.py:2163 ++#: ../output.py:2234 ../output.py:2236 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 -+#: ../output.py:2176 ++#: ../output.py:2240 ../output.py:2243 ../output.py:2245 ../output.py:2247 ++#: ../output.py:2249 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2167 ../output.py:2172 ++#: ../output.py:2240 ../output.py:2245 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2170 ++#: ../output.py:2243 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2174 ++#: ../output.py:2247 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2176 ++#: ../output.py:2249 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2181 ../output.py:2183 ../output.py:2573 ++#: ../output.py:2254 ../output.py:2256 ../output.py:2645 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2192 ++#: ../output.py:2265 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2197 ++#: ../output.py:2270 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2201 ++#: ../output.py:2274 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2205 ++#: ../output.py:2278 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2213 ++#: ../output.py:2286 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2224 ++#: ../output.py:2297 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2230 ++#: ../output.py:2303 msgid "Errors:" msgstr "" @@ -134305,17 +137378,17 @@ index 97ae91a..15ddd8d 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2238 ++#: ../output.py:2311 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2240 ++#: ../output.py:2313 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2241 ++#: ../output.py:2314 msgid "Erase" msgstr "" @@ -134328,224 +137401,224 @@ index 97ae91a..15ddd8d 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2245 ++#: ../output.py:2318 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2319 ++#: ../output.py:2392 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2345 ++#: ../output.py:2418 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2346 ++#: ../output.py:2419 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2347 ++#: ../output.py:2420 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2348 ++#: ../output.py:2421 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2349 ++#: ../output.py:2422 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2350 ++#: ../output.py:2423 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2351 ++#: ../output.py:2424 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2398 ++#: ../output.py:2471 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2404 ++#: ../output.py:2477 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2405 ++#: ../output.py:2478 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2418 ++#: ../output.py:2491 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2545 ++#: ../output.py:2617 +msgid "Package :" +msgstr "" + -+#: ../output.py:2546 ++#: ../output.py:2618 +msgid "State :" +msgstr "" + -+#: ../output.py:2549 ++#: ../output.py:2621 +msgid "Size :" +msgstr "" + -+#: ../output.py:2551 ++#: ../output.py:2623 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2626 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2628 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2630 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2560 ++#: ../output.py:2632 +msgid "License :" +msgstr "" + -+#: ../output.py:2562 ++#: ../output.py:2634 +msgid "URL :" +msgstr "" + -+#: ../output.py:2564 ++#: ../output.py:2636 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2567 ++#: ../output.py:2639 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2641 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2571 ++#: ../output.py:2643 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2575 ++#: ../output.py:2647 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2579 ++#: ../output.py:2651 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2583 ++#: ../output.py:2655 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2628 ++#: ../output.py:2700 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2629 ++#: ../output.py:2701 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2630 ++#: ../output.py:2702 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2631 ++#: ../output.py:2703 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2632 ++#: ../output.py:2704 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2633 ++#: ../output.py:2705 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2634 ++#: ../output.py:2706 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2635 ++#: ../output.py:2707 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2639 ++#: ../output.py:2711 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2650 ++#: ../output.py:2722 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2656 ++#: ../output.py:2728 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2662 ++#: ../output.py:2734 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2675 ../output.py:2688 ++#: ../output.py:2747 ../output.py:2760 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2701 ++#: ../output.py:2773 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2710 ++#: ../output.py:2782 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2727 ++#: ../output.py:2799 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2729 ++#: ../output.py:2801 #, python-format msgid "" "\n" @@ -134553,7 +137626,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2738 ++#: ../output.py:2810 #, python-format msgid "" "\n" @@ -134561,7 +137634,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2743 ++#: ../output.py:2815 #, python-format msgid "" "\n" @@ -134569,7 +137642,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2745 ++#: ../output.py:2817 msgid "" "\n" " Not found" @@ -134577,38 +137650,38 @@ index 97ae91a..15ddd8d 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2760 ++#: ../output.py:2832 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2761 ++#: ../output.py:2833 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2762 ++#: ../output.py:2834 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2780 ++#: ../output.py:2852 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2815 ../output.py:2828 ++#: ../output.py:2887 ../output.py:2900 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2834 ++#: ../output.py:2906 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2843 ++#: ../output.py:2915 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" @@ -134616,7 +137689,7 @@ index 97ae91a..15ddd8d 100644 -#: ../utils.py:99 +#. self.event(txmbr.name, count, len(base.tsInfo), count, ) +#. (te_current*100L)/te_total -+#: ../output.py:3107 ++#: ../output.py:3180 +msgid "Verifying" +msgstr "" + @@ -134645,7 +137718,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1803 ++#: ../utils.py:134 ../yumcommands.py:1937 msgid "Unknown" msgstr "" @@ -134699,12 +137772,12 @@ index 97ae91a..15ddd8d 100644 #, python-format msgid "" "\n" -@@ -1423,47 +1514,47 @@ msgid "" +@@ -1423,47 +1524,47 @@ msgid "" "%s" msgstr "" -#: ../utils.py:228 ../yummain.py:123 -+#: ../utils.py:286 ../yummain.py:134 ++#: ../utils.py:286 ../yummain.py:140 msgid "" "Another app is currently holding the yum lock; exiting as configured by " "exit_on_lock" @@ -134723,13 +137796,13 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../utils.py:342 ../yummain.py:150 ../yummain.py:189 -+#: ../utils.py:413 ../yummain.py:161 ../yummain.py:200 ++#: ../utils.py:413 ../yummain.py:167 ../yummain.py:206 #, python-format msgid "Error: %s" msgstr "" -#: ../utils.py:346 ../yummain.py:194 -+#: ../utils.py:417 ../yummain.py:205 ++#: ../utils.py:417 ../yummain.py:211 msgid " You could try using --skip-broken to work around the problem" msgstr "" @@ -134739,94 +137812,94 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../utils.py:355 ../yummain.py:160 ../yummain.py:202 -+#: ../utils.py:426 ../yummain.py:171 ../yummain.py:213 ++#: ../utils.py:426 ../yummain.py:177 ../yummain.py:219 #, python-format msgid "Unknown Error(s): Exit Code: %d:" msgstr "" -#: ../utils.py:361 ../yummain.py:208 -+#: ../utils.py:432 ../yummain.py:219 ++#: ../utils.py:432 ../yummain.py:225 msgid "" "\n" "Dependencies Resolved" msgstr "" -#: ../utils.py:376 ../yummain.py:234 -+#: ../utils.py:448 ../yummain.py:251 ++#: ../utils.py:448 ../yummain.py:257 msgid "Complete!" msgstr "" -@@ -1475,7 +1566,7 @@ msgstr "" +@@ -1475,7 +1576,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" -#: ../yumcommands.py:59 -+#: ../yumcommands.py:65 ++#: ../yumcommands.py:67 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1493,451 +1584,480 @@ msgid "" +@@ -1493,451 +1594,488 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" -#: ../yumcommands.py:74 -+#: ../yumcommands.py:80 ++#: ../yumcommands.py:82 #, python-format msgid "Problem repository: %s" msgstr "" -#: ../yumcommands.py:80 -+#: ../yumcommands.py:94 ++#: ../yumcommands.py:96 #, python-format msgid "Error: Need to pass a list of pkgs to %s" msgstr "" -#: ../yumcommands.py:86 -+#: ../yumcommands.py:110 ++#: ../yumcommands.py:112 msgid "Error: Need an item to match" msgstr "" -#: ../yumcommands.py:92 -+#: ../yumcommands.py:124 ++#: ../yumcommands.py:126 msgid "Error: Need a group or list of groups" msgstr "" -#: ../yumcommands.py:101 -+#: ../yumcommands.py:141 ++#: ../yumcommands.py:143 #, python-format msgid "Error: clean requires an option: %s" msgstr "" -#: ../yumcommands.py:106 -+#: ../yumcommands.py:146 ++#: ../yumcommands.py:149 #, python-format msgid "Error: invalid clean argument: %r" msgstr "" -#: ../yumcommands.py:119 -+#: ../yumcommands.py:161 ++#: ../yumcommands.py:164 msgid "No argument to shell" msgstr "" -#: ../yumcommands.py:121 -+#: ../yumcommands.py:163 ++#: ../yumcommands.py:166 #, python-format msgid "Filename passed to shell: %s" msgstr "" -#: ../yumcommands.py:125 -+#: ../yumcommands.py:167 ++#: ../yumcommands.py:170 #, python-format msgid "File %s given as argument to shell does not exist." msgstr "" -#: ../yumcommands.py:131 -+#: ../yumcommands.py:173 ++#: ../yumcommands.py:176 msgid "Error: more than one file given as argument to shell." msgstr "" -#: ../yumcommands.py:148 -+#: ../yumcommands.py:192 ++#: ../yumcommands.py:195 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" @@ -134834,196 +137907,200 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yumcommands.py:200 -+#: ../yumcommands.py:300 ++#: ../yumcommands.py:303 msgid "PACKAGE..." msgstr "" -#: ../yumcommands.py:203 -+#: ../yumcommands.py:307 ++#: ../yumcommands.py:310 msgid "Install a package or packages on your system" msgstr "" -#: ../yumcommands.py:212 -+#: ../yumcommands.py:338 ++#: ../yumcommands.py:341 msgid "Setting up Install Process" msgstr "" -#: ../yumcommands.py:223 ../yumcommands.py:245 -+#: ../yumcommands.py:363 ../yumcommands.py:423 ++#: ../yumcommands.py:367 ../yumcommands.py:427 msgid "[PACKAGE...]" msgstr "" -#: ../yumcommands.py:226 -+#: ../yumcommands.py:370 ++#: ../yumcommands.py:374 msgid "Update a package or packages on your system" msgstr "" -#: ../yumcommands.py:234 -+#: ../yumcommands.py:399 ++#: ../yumcommands.py:403 msgid "Setting up Update Process" msgstr "" -#: ../yumcommands.py:248 -+#: ../yumcommands.py:430 ++#: ../yumcommands.py:434 msgid "Synchronize installed packages to the latest available versions" msgstr "" -#: ../yumcommands.py:256 -+#: ../yumcommands.py:459 ++#: ../yumcommands.py:463 msgid "Setting up Distribution Synchronization Process" msgstr "" -#: ../yumcommands.py:299 -+#: ../yumcommands.py:519 ++#: ../yumcommands.py:523 msgid "Display details about a package or group of packages" msgstr "" -#: ../yumcommands.py:348 -+#: ../yumcommands.py:581 ++#: ../yumcommands.py:591 msgid "Installed Packages" msgstr "" -#: ../yumcommands.py:356 -+#: ../yumcommands.py:589 ++#: ../yumcommands.py:601 msgid "Available Packages" msgstr "" -#: ../yumcommands.py:360 -+#: ../yumcommands.py:593 ++#: ../yumcommands.py:606 msgid "Extra Packages" msgstr "" -#: ../yumcommands.py:364 -+#: ../yumcommands.py:597 ++#: ../yumcommands.py:610 msgid "Updated Packages" msgstr "" #. This only happens in verbose mode -#: ../yumcommands.py:372 ../yumcommands.py:379 ../yumcommands.py:667 -+#: ../yumcommands.py:605 ../yumcommands.py:612 ../yumcommands.py:1193 ++#: ../yumcommands.py:618 ../yumcommands.py:625 ../yumcommands.py:1329 msgid "Obsoleting Packages" msgstr "" -#: ../yumcommands.py:381 -+#: ../yumcommands.py:614 ++#: ../yumcommands.py:627 msgid "Recently Added Packages" msgstr "" -#: ../yumcommands.py:388 -+#: ../yumcommands.py:621 ++#: ../yumcommands.py:634 msgid "No matching Packages to list" msgstr "" -#: ../yumcommands.py:402 -+#: ../yumcommands.py:656 ++#: ../yumcommands.py:669 msgid "List a package or groups of packages" msgstr "" -#: ../yumcommands.py:414 -+#: ../yumcommands.py:685 ++#: ../yumcommands.py:698 msgid "Remove a package or packages from your system" msgstr "" -#: ../yumcommands.py:421 -+#: ../yumcommands.py:714 ++#: ../yumcommands.py:727 msgid "Setting up Remove Process" msgstr "" -#: ../yumcommands.py:435 -msgid "Setting up Group Process" -+#: ../yumcommands.py:773 ++#: ../yumcommands.py:786 +msgid "Display, or use, the groups information" msgstr "" -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- ++#: ../yumcommands.py:789 ++msgid "Setting up Group Process" + msgstr "" + -#: ../yumcommands.py:454 -msgid "List available package groups" --msgstr "" -- ++#: ../yumcommands.py:795 ++msgid "No Groups on which to run command" + msgstr "" + -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" -+#: ../yumcommands.py:776 -+msgid "Setting up Group Process" ++#: ../yumcommands.py:859 ++#, python-format ++msgid "Invalid groups sub-command, use: %s." msgstr "" -#: ../yumcommands.py:497 -msgid "Remove the packages in a group from your system" -+#: ../yumcommands.py:782 -+msgid "No Groups on which to run command" ++#: ../yumcommands.py:866 ++msgid "There is no installed groups file." msgstr "" -#: ../yumcommands.py:525 -msgid "Display details about a package group" -+#: ../yumcommands.py:833 -+#, python-format -+msgid "Invalid groups sub-command, use: %s." ++#: ../yumcommands.py:868 ++msgid "You don't have access to the groups DB." msgstr "" -#: ../yumcommands.py:550 -+#: ../yumcommands.py:929 ++#: ../yumcommands.py:1067 msgid "Generate the metadata cache" msgstr "" -#: ../yumcommands.py:556 -+#: ../yumcommands.py:955 ++#: ../yumcommands.py:1093 msgid "Making cache files for all metadata files." msgstr "" -#: ../yumcommands.py:557 -+#: ../yumcommands.py:956 ++#: ../yumcommands.py:1094 msgid "This may take a while depending on the speed of this computer" msgstr "" -#: ../yumcommands.py:578 -+#: ../yumcommands.py:977 ++#: ../yumcommands.py:1113 msgid "Metadata Cache Created" msgstr "" -#: ../yumcommands.py:592 -+#: ../yumcommands.py:1015 ++#: ../yumcommands.py:1151 msgid "Remove cached data" msgstr "" -#: ../yumcommands.py:613 -+#: ../yumcommands.py:1082 ++#: ../yumcommands.py:1218 msgid "Find what package provides the given value" msgstr "" -#: ../yumcommands.py:633 -+#: ../yumcommands.py:1139 ++#: ../yumcommands.py:1275 msgid "Check for available package updates" msgstr "" -#: ../yumcommands.py:687 -+#: ../yumcommands.py:1230 ++#: ../yumcommands.py:1366 msgid "Search package details for the given string" msgstr "" -#: ../yumcommands.py:693 -+#: ../yumcommands.py:1256 ++#: ../yumcommands.py:1392 msgid "Searching Packages: " msgstr "" -#: ../yumcommands.py:710 -+#: ../yumcommands.py:1298 ++#: ../yumcommands.py:1434 msgid "Update packages taking obsoletes into account" msgstr "" -#: ../yumcommands.py:719 -+#: ../yumcommands.py:1328 ++#: ../yumcommands.py:1464 msgid "Setting up Upgrade Process" msgstr "" -#: ../yumcommands.py:737 -+#: ../yumcommands.py:1363 ++#: ../yumcommands.py:1499 msgid "Install a local RPM" msgstr "" -#: ../yumcommands.py:745 -+#: ../yumcommands.py:1393 ++#: ../yumcommands.py:1529 msgid "Setting up Local Package Process" msgstr "" @@ -135032,183 +138109,183 @@ index 97ae91a..15ddd8d 100644 -msgstr "" - -#: ../yumcommands.py:767 -+#: ../yumcommands.py:1457 ++#: ../yumcommands.py:1593 msgid "Searching Packages for Dependency:" msgstr "" -#: ../yumcommands.py:781 -+#: ../yumcommands.py:1488 ++#: ../yumcommands.py:1624 msgid "Run an interactive yum shell" msgstr "" -#: ../yumcommands.py:787 -+#: ../yumcommands.py:1514 ++#: ../yumcommands.py:1650 msgid "Setting up Yum Shell" msgstr "" -#: ../yumcommands.py:805 -+#: ../yumcommands.py:1557 ++#: ../yumcommands.py:1693 msgid "List a package's dependencies" msgstr "" -#: ../yumcommands.py:811 -+#: ../yumcommands.py:1584 ++#: ../yumcommands.py:1720 msgid "Finding dependencies: " msgstr "" -#: ../yumcommands.py:827 -+#: ../yumcommands.py:1616 ++#: ../yumcommands.py:1752 msgid "Display the configured software repositories" msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1702 ../yumcommands.py:1703 ++#: ../yumcommands.py:1838 ../yumcommands.py:1839 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1729 ../yumcommands.py:1730 ++#: ../yumcommands.py:1865 ../yumcommands.py:1866 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1881 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1747 ++#: ../yumcommands.py:1882 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1885 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1753 ++#: ../yumcommands.py:1888 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1757 ++#: ../yumcommands.py:1892 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1898 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1768 ++#: ../yumcommands.py:1903 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1770 ++#: ../yumcommands.py:1905 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1771 ++#: ../yumcommands.py:1906 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1778 ../yumcommands.py:1799 ++#: ../yumcommands.py:1913 ../yumcommands.py:1934 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1921 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1790 ++#: ../yumcommands.py:1925 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1793 ++#: ../yumcommands.py:1928 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1943 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1811 ++#: ../yumcommands.py:1945 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1814 ++#: ../yumcommands.py:1948 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1950 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1819 ++#: ../yumcommands.py:1953 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1823 ++#: ../yumcommands.py:1957 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1827 ++#: ../yumcommands.py:1961 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1831 ++#: ../yumcommands.py:1965 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1841 ../yumcommands.py:1870 ++#: ../yumcommands.py:1974 ../yumcommands.py:2003 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 ++#: ../yumcommands.py:1991 ../yumcommands.py:1992 ../yumcommands.py:2010 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1871 ++#: ../yumcommands.py:2004 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1933 ++#: ../yumcommands.py:2066 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:2108 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1980 ++#: ../yumcommands.py:2113 msgid "" "\n" "\n" @@ -135216,7 +138293,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1982 ++#: ../yumcommands.py:2115 msgid "" "\n" "\n" @@ -135224,148 +138301,148 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2067 ++#: ../yumcommands.py:2200 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2079 ++#: ../yumcommands.py:2212 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2142 ++#: ../yumcommands.py:2275 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2153 ++#: ../yumcommands.py:2286 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2192 ++#: ../yumcommands.py:2325 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2244 ++#: ../yumcommands.py:2377 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2254 ++#: ../yumcommands.py:2387 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2255 ++#: ../yumcommands.py:2388 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2284 ++#: ../yumcommands.py:2417 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2292 ++#: ../yumcommands.py:2425 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2301 ++#: ../yumcommands.py:2434 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2310 ++#: ../yumcommands.py:2443 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2374 ++#: ../yumcommands.py:2507 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2601 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2602 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2603 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2471 ++#: ../yumcommands.py:2604 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2472 ++#: ../yumcommands.py:2605 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2473 ++#: ../yumcommands.py:2606 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2474 ++#: ../yumcommands.py:2607 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2475 ++#: ../yumcommands.py:2608 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2476 ++#: ../yumcommands.py:2609 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2477 ++#: ../yumcommands.py:2610 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2643 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2517 ++#: ../yumcommands.py:2650 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2609 ++#: ../yumcommands.py:2742 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2674 ++#: ../yumcommands.py:2807 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2691 ++#: ../yumcommands.py:2824 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2695 ++#: ../yumcommands.py:2828 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2701 ++#: ../yumcommands.py:2834 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1948,908 +2068,928 @@ msgstr "" +@@ -1948,908 +2086,952 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -135374,26 +138451,30 @@ index 97ae91a..15ddd8d 100644 -"Another app is currently holding the yum lock; waiting for it to exit..." +#: ../yummain.py:110 +msgid "No read/execute access in current directory, moving to /" ++msgstr "" ++ ++#: ../yummain.py:118 ++msgid "No getcwd() access in current directory, moving to /" msgstr "" -#: ../yummain.py:120 -+#: ../yummain.py:124 ++#: ../yummain.py:130 msgid "Can't create lock file; exiting" msgstr "" -+#: ../yummain.py:128 ++#: ../yummain.py:134 +msgid "" +"Another app is currently holding the yum lock; waiting for it to exit..." +msgstr "" + #. Depsolve stage -#: ../yummain.py:167 -+#: ../yummain.py:178 ++#: ../yummain.py:184 msgid "Resolving Dependencies" msgstr "" -#: ../yummain.py:230 -+#: ../yummain.py:241 ../yummain.py:249 ++#: ../yummain.py:247 ../yummain.py:255 #, python-format -msgid "Your transaction was saved, rerun it with: yum load-transaction %s" +msgid "" @@ -135402,7 +138483,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yummain.py:288 -+#: ../yummain.py:326 ++#: ../yummain.py:332 msgid "" "\n" "\n" @@ -135410,88 +138491,88 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:85 ++#: ../yum/depsolve.py:127 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:100 ++#: ../yum/depsolve.py:143 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:154 ++#: ../yum/depsolve.py:200 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:172 ++#: ../yum/depsolve.py:218 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:223 ++#: ../yum/depsolve.py:269 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 ++#: ../yum/depsolve.py:283 ../yum/depsolve.py:916 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:249 ++#: ../yum/depsolve.py:295 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:265 ++#: ../yum/depsolve.py:311 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:287 ++#: ../yum/depsolve.py:333 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:328 ++#: ../yum/depsolve.py:374 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:355 ++#: ../yum/depsolve.py:401 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:365 ++#: ../yum/depsolve.py:411 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:373 ++#: ../yum/depsolve.py:419 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:396 ++#: ../yum/depsolve.py:442 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:400 ++#: ../yum/depsolve.py:446 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" @@ -135499,136 +138580,136 @@ index 97ae91a..15ddd8d 100644 #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 ++#: ../yum/depsolve.py:451 ../yum/depsolve.py:486 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 ++#: ../yum/depsolve.py:480 ../yum/depsolve.py:490 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:450 ++#: ../yum/depsolve.py:496 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:463 ++#: ../yum/depsolve.py:509 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:466 ++#: ../yum/depsolve.py:512 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:474 ++#: ../yum/depsolve.py:520 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:505 ++#: ../yum/depsolve.py:551 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:547 ++#: ../yum/depsolve.py:593 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:563 ++#: ../yum/depsolve.py:609 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:574 ++#: ../yum/depsolve.py:620 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:592 ++#: ../yum/depsolve.py:638 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:641 ++#: ../yum/depsolve.py:687 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:650 ++#: ../yum/depsolve.py:696 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 ++#: ../yum/depsolve.py:831 ../yum/depsolve.py:946 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 ++#: ../yum/depsolve.py:871 ../yum/depsolve.py:906 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:880 ++#: ../yum/depsolve.py:926 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:902 ++#: ../yum/depsolve.py:948 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:926 ++#: ../yum/depsolve.py:972 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1012 ++#: ../yum/depsolve.py:1061 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1255 ++#: ../yum/depsolve.py:1304 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 ++#: ../yum/depsolve.py:1331 ../yum/depsolve.py:1337 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1384 ++#: ../yum/depsolve.py:1451 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1396 ++#: ../yum/depsolve.py:1463 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -135636,248 +138717,254 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1404 ++#: ../yum/depsolve.py:1471 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1408 ++#: ../yum/depsolve.py:1475 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1414 ++#: ../yum/depsolve.py:1481 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1445 ++#: ../yum/depsolve.py:1498 #, python-format - msgid "requires minimal: %d" +-msgid "requires minimal: %d" ++msgid "provides vercmp: %s" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1449 ++#: ../yum/depsolve.py:1502 ../yum/depsolve.py:1536 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1454 ++#: ../yum/depsolve.py:1532 ++#, python-format ++msgid "requires minimal: %d" ++msgstr "" ++ ++#: ../yum/depsolve.py:1541 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1470 ++#: ../yum/depsolve.py:1557 #, python-format msgid "Best Order: %s" msgstr "" -#: ../yum/__init__.py:234 -+#: ../yum/__init__.py:261 ++#: ../yum/__init__.py:266 msgid "doConfigSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/__init__.py:482 -+#: ../yum/__init__.py:527 ++#: ../yum/__init__.py:554 #, python-format msgid "Repository %r: Error parsing config: %s" msgstr "" -#: ../yum/__init__.py:488 -+#: ../yum/__init__.py:533 ++#: ../yum/__init__.py:560 #, python-format msgid "Repository %r is missing name in configuration, using id" msgstr "" -#: ../yum/__init__.py:526 -+#: ../yum/__init__.py:571 ++#: ../yum/__init__.py:598 msgid "plugins already initialised" msgstr "" -#: ../yum/__init__.py:533 -+#: ../yum/__init__.py:580 ++#: ../yum/__init__.py:607 msgid "doRpmDBSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/__init__.py:544 -+#: ../yum/__init__.py:591 ++#: ../yum/__init__.py:618 msgid "Reading Local RPMDB" msgstr "" -#: ../yum/__init__.py:567 -+#: ../yum/__init__.py:621 ++#: ../yum/__init__.py:648 msgid "doRepoSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/__init__.py:630 -+#: ../yum/__init__.py:692 ++#: ../yum/__init__.py:719 msgid "doSackSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/__init__.py:660 -+#: ../yum/__init__.py:722 ++#: ../yum/__init__.py:749 msgid "Setting up Package Sacks" msgstr "" -#: ../yum/__init__.py:705 -+#: ../yum/__init__.py:767 ++#: ../yum/__init__.py:794 #, python-format msgid "repo object for repo %s lacks a _resetSack method\n" msgstr "" -#: ../yum/__init__.py:706 -+#: ../yum/__init__.py:768 ++#: ../yum/__init__.py:795 msgid "therefore this repo cannot be reset.\n" msgstr "" -#: ../yum/__init__.py:711 -+#: ../yum/__init__.py:776 ++#: ../yum/__init__.py:803 msgid "doUpdateSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/__init__.py:723 -+#: ../yum/__init__.py:788 ++#: ../yum/__init__.py:815 msgid "Building updates object" msgstr "" -#: ../yum/__init__.py:765 -+#: ../yum/__init__.py:832 ++#: ../yum/__init__.py:859 msgid "doGroupSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/__init__.py:790 -+#: ../yum/__init__.py:857 ++#: ../yum/__init__.py:884 msgid "Getting group metadata" msgstr "" -#: ../yum/__init__.py:816 -+#: ../yum/__init__.py:885 ++#: ../yum/__init__.py:912 #, python-format msgid "Adding group file from repository: %s" msgstr "" -#: ../yum/__init__.py:827 -+#: ../yum/__init__.py:896 ++#: ../yum/__init__.py:923 #, python-format msgid "Failed to add groups file for repository: %s - %s" msgstr "" -#: ../yum/__init__.py:833 -+#: ../yum/__init__.py:902 ++#: ../yum/__init__.py:929 msgid "No Groups Available in any repository" msgstr "" -#: ../yum/__init__.py:845 -+#: ../yum/__init__.py:914 ++#: ../yum/__init__.py:944 msgid "Getting pkgtags metadata" msgstr "" -#: ../yum/__init__.py:855 -+#: ../yum/__init__.py:924 ++#: ../yum/__init__.py:954 #, python-format msgid "Adding tags from repository: %s" msgstr "" -#: ../yum/__init__.py:866 -+#: ../yum/__init__.py:935 ++#: ../yum/__init__.py:965 #, python-format msgid "Failed to add Pkg Tags for repository: %s - %s" msgstr "" -#: ../yum/__init__.py:944 -+#: ../yum/__init__.py:1015 ++#: ../yum/__init__.py:1058 msgid "Importing additional filelist information" msgstr "" -#: ../yum/__init__.py:958 -+#: ../yum/__init__.py:1033 ++#: ../yum/__init__.py:1076 #, python-format msgid "The program %s%s%s is found in the yum-utils package." msgstr "" -#: ../yum/__init__.py:966 -+#: ../yum/__init__.py:1050 ++#: ../yum/__init__.py:1093 msgid "" "There are unfinished transactions remaining. You might consider running yum-" "complete-transaction first to finish them." msgstr "" -#: ../yum/__init__.py:983 -+#: ../yum/__init__.py:1067 ++#: ../yum/__init__.py:1110 msgid "--> Finding unneeded leftover dependencies" msgstr "" -#: ../yum/__init__.py:1041 -+#: ../yum/__init__.py:1125 ++#: ../yum/__init__.py:1168 #, python-format msgid "Protected multilib versions: %s != %s" msgstr "" -#: ../yum/__init__.py:1096 -+#: ../yum/__init__.py:1180 ++#: ../yum/__init__.py:1223 #, python-format msgid "Trying to remove \"%s\", which is protected" msgstr "" -#: ../yum/__init__.py:1217 -+#: ../yum/__init__.py:1301 ++#: ../yum/__init__.py:1344 msgid "" "\n" "Packages skipped because of dependency problems:" msgstr "" -#: ../yum/__init__.py:1221 -+#: ../yum/__init__.py:1305 ++#: ../yum/__init__.py:1348 #, python-format msgid " %s from %s" msgstr "" #. FIXME: _N() -#: ../yum/__init__.py:1391 -+#: ../yum/__init__.py:1477 ++#: ../yum/__init__.py:1520 #, python-format msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:" msgstr "" -#: ../yum/__init__.py:1395 -+#: ../yum/__init__.py:1481 ++#: ../yum/__init__.py:1524 msgid "Warning: RPMDB altered outside of yum." msgstr "" -#: ../yum/__init__.py:1407 -+#: ../yum/__init__.py:1493 ++#: ../yum/__init__.py:1536 msgid "missing requires" msgstr "" -#: ../yum/__init__.py:1408 -+#: ../yum/__init__.py:1494 ++#: ../yum/__init__.py:1537 msgid "installed conflict" msgstr "" -#: ../yum/__init__.py:1525 -+#: ../yum/__init__.py:1630 ++#: ../yum/__init__.py:1673 msgid "" "Warning: scriptlet or other non-fatal errors occurred during transaction." msgstr "" -#: ../yum/__init__.py:1535 -+#: ../yum/__init__.py:1640 ++#: ../yum/__init__.py:1683 msgid "Transaction couldn't start:" msgstr "" #. should this be 'to_unicoded'? -#: ../yum/__init__.py:1538 -+#: ../yum/__init__.py:1643 ++#: ../yum/__init__.py:1686 msgid "Could not run transaction." msgstr "" -#: ../yum/__init__.py:1552 -+#: ../yum/__init__.py:1657 ++#: ../yum/__init__.py:1700 #, python-format msgid "Failed to remove transaction file %s" msgstr "" @@ -135885,7 +138972,7 @@ index 97ae91a..15ddd8d 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1711 ++#: ../yum/__init__.py:1756 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -135896,14 +138983,14 @@ index 97ae91a..15ddd8d 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1782 ++#: ../yum/__init__.py:1833 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 +#. Another copy seems to be running. -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1968 #, python-format -msgid "Could not open lock %s: %s" +msgid "Existing lock %s: another copy is running as pid %s." @@ -135911,7 +138998,7 @@ index 97ae91a..15ddd8d 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1966 ++#: ../yum/__init__.py:2017 #, python-format -msgid "Unable to check if PID %s is active" +msgid "Could not create lock at %s: %s " @@ -135919,7 +139006,7 @@ index 97ae91a..15ddd8d 100644 -#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1978 ++#: ../yum/__init__.py:2029 #, python-format -msgid "Existing lock %s: another copy is running as pid %s." +msgid "Could not open lock %s: %s" @@ -135928,14 +139015,14 @@ index 97ae91a..15ddd8d 100644 +#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1995 ++#: ../yum/__init__.py:2046 #, python-format -msgid "Could not create lock at %s: %s " +msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2045 ++#: ../yum/__init__.py:2096 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum --enablerepo=" @@ -135943,23 +139030,23 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2068 ++#: ../yum/__init__.py:2119 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2071 ++#: ../yum/__init__.py:2122 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2134 ++#: ../yum/__init__.py:2185 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 ++#: ../yum/__init__.py:2188 ../yum/__init__.py:2218 #, python-format msgid "using local copy of %s" msgstr "" @@ -135973,67 +139060,67 @@ index 97ae91a..15ddd8d 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2245 ++#: ../yum/__init__.py:2296 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2285 ++#: ../yum/__init__.py:2336 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2345 ++#: ../yum/__init__.py:2396 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2349 ++#: ../yum/__init__.py:2400 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2357 ++#: ../yum/__init__.py:2408 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2361 ++#: ../yum/__init__.py:2412 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2403 ++#: ../yum/__init__.py:2454 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2407 ++#: ../yum/__init__.py:2458 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2466 ++#: ../yum/__init__.py:2519 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2470 ++#: ../yum/__init__.py:2523 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2472 ++#: ../yum/__init__.py:2525 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -136043,26 +139130,26 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2562 ++#: ../yum/__init__.py:2627 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2568 ++#: ../yum/__init__.py:2633 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2932 ++#: ../yum/__init__.py:2997 msgid "" "searchPackages() will go away in a future version of " "Yum. Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2988 ++#: ../yum/__init__.py:3053 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -136072,62 +139159,68 @@ index 97ae91a..15ddd8d 100644 +msgstr[1] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2992 ++#: ../yum/__init__.py:3057 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:3004 ++#: ../yum/__init__.py:3069 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:3011 ++#: ../yum/__init__.py:3076 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3096 ++#: ../yum/__init__.py:3213 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 -+#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 -+#: ../yum/__init__.py:3742 ++#: ../yum/__init__.py:3271 ../yum/__init__.py:3298 ../yum/__init__.py:3334 ++#: ../yum/__init__.py:3340 ../yum/__init__.py:3469 ../yum/__init__.py:3473 ++#: ../yum/__init__.py:3939 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 ++#: ../yum/__init__.py:3310 ../yum/__init__.py:3489 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3216 ++#. (upgrade and igroup_data[pkg] == 'available')): ++#: ../yum/__init__.py:3376 ++#, python-format ++msgid "Skipping package %s from group %s" ++msgstr "" ++ ++#: ../yum/__init__.py:3382 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3220 ++#: ../yum/__init__.py:3402 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3270 ++#: ../yum/__init__.py:3453 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3272 ++#: ../yum/__init__.py:3455 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -136135,79 +139228,77 @@ index 97ae91a..15ddd8d 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3344 ++#: ../yum/__init__.py:3527 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3372 ++#: ../yum/__init__.py:3555 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 ++#: ../yum/__init__.py:3618 ../yum/__init__.py:3681 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 -+#: ../yum/__init__.py:3526 ++#: ../yum/__init__.py:3642 ../yum/__init__.py:3648 ../yum/__init__.py:3705 ++#: ../yum/__init__.py:3711 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3826 ++#: ../yum/__init__.py:4023 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3830 ++#: ../yum/__init__.py:4027 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 ++#: ../yum/__init__.py:4046 ../yum/__init__.py:4957 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 -+#: ../yum/__init__.py:4757 - #, python-format - msgid "No Match for argument: %s" - msgstr "" - +-#, python-format +-msgid "No Match for argument: %s" +-msgstr "" +- -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3932 ++#: ../yum/__init__.py:4121 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3935 ++#: ../yum/__init__.py:4124 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3947 ++#: ../yum/__init__.py:4136 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3975 ++#: ../yum/__init__.py:4164 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3980 ++#: ../yum/__init__.py:4169 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -136215,117 +139306,122 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3983 ++#: ../yum/__init__.py:4172 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3991 ++#: ../yum/__init__.py:4180 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:4005 ++#: ../yum/__init__.py:4194 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4128 ++#: ../yum/__init__.py:4317 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 -+#: ../yum/__init__.py:4360 ++#: ../yum/__init__.py:4341 ../yum/__init__.py:4488 ../yum/__init__.py:4530 ++#: ../yum/__init__.py:4566 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 ++#: ../yum/__init__.py:4391 ../yum/__init__.py:4623 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4237 ++#: ../yum/__init__.py:4413 ../yum/__init__.py:4627 ../yum/__init__.py:4963 ++#, python-format ++msgid "No Match for argument: %s" ++msgstr "" ++ ++#: ../yum/__init__.py:4431 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4283 ++#: ../yum/__init__.py:4477 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4319 ++#: ../yum/__init__.py:4525 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 ++#: ../yum/__init__.py:4534 ../yum/__init__.py:4570 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4434 ++#: ../yum/__init__.py:4640 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4440 ++#: ../yum/__init__.py:4646 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4446 ++#: ../yum/__init__.py:4652 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4483 ++#: ../yum/__init__.py:4689 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 ++#: ../yum/__init__.py:4692 ../yum/__init__.py:4809 ../yum/__init__.py:4894 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4490 ++#: ../yum/__init__.py:4696 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 ++#: ../yum/__init__.py:4705 ../yum/__init__.py:4812 ../yum/__init__.py:4897 #, python-format msgid "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4505 ++#: ../yum/__init__.py:4711 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4513 ++#: ../yum/__init__.py:4719 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -136333,7 +139429,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4738 ../yum/__init__.py:4745 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it " @@ -136341,118 +139437,118 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 ++#: ../yum/__init__.py:4754 ../yum/__init__.py:4817 ../yum/__init__.py:4902 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4553 ++#: ../yum/__init__.py:4759 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4559 ++#: ../yum/__init__.py:4765 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4566 ++#: ../yum/__init__.py:4772 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 ++#: ../yum/__init__.py:4806 ../yum/__init__.py:4891 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4640 ++#: ../yum/__init__.py:4846 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4666 ++#: ../yum/__init__.py:4872 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4779 ++#: ../yum/__init__.py:4985 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4787 ++#: ../yum/__init__.py:4993 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4833 ++#: ../yum/__init__.py:5039 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4840 ++#: ../yum/__init__.py:5046 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 ++#: ../yum/__init__.py:5159 ../yum/__init__.py:5226 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 ++#: ../yum/__init__.py:5176 ../yum/__init__.py:5232 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5059 ++#: ../yum/__init__.py:5265 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5077 ++#: ../yum/__init__.py:5283 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5100 ++#: ../yum/__init__.py:5306 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5102 ++#: ../yum/__init__.py:5308 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5110 ++#: ../yum/__init__.py:5316 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5119 ++#: ../yum/__init__.py:5325 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5135 ++#: ../yum/__init__.py:5341 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -136466,7 +139562,7 @@ index 97ae91a..15ddd8d 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5145 ++#: ../yum/__init__.py:5351 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -136475,182 +139571,213 @@ index 97ae91a..15ddd8d 100644 +" Userid : \"%s\"\n" +" Fingerprint: %s\n" +" From : %s" ++msgstr "" ++ ++#: ../yum/__init__.py:5379 ++#, python-format ++msgid "" ++"\n" ++"\n" ++"\n" ++" Failing package is: %s\n" ++" GPG Keys are configured as: %s\n" msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5180 ++#: ../yum/__init__.py:5393 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5219 ++#: ../yum/__init__.py:5431 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 ++#: ../yum/__init__.py:5433 ../yum/__init__.py:5534 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5224 ++#: ../yum/__init__.py:5437 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5228 ++#: ../yum/__init__.py:5440 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2857,25 +2997,25 @@ msgid "" +@@ -2857,25 +3039,45 @@ msgid "" "Check that the correct key URLs are configured for this repository." msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5237 ++#: ../yum/__init__.py:5450 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5261 ++#: ../yum/__init__.py:5472 ++msgid "No" ++msgstr "" ++ ++#: ../yum/__init__.py:5474 ++msgid "Yes" ++msgstr "" ++ ++#: ../yum/__init__.py:5475 ++#, python-format ++msgid "" ++"\n" ++"\n" ++"\n" ++" CA Key: %s\n" ++" Failing repo is: %s\n" ++" GPG Keys are configured as: %s\n" ++msgstr "" ++ ++#: ../yum/__init__.py:5488 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5305 - msgid "Key import failed" +-msgid "Key import failed" ++#: ../yum/__init__.py:5532 ++#, python-format ++msgid "Key %s import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5321 ++#: ../yum/__init__.py:5549 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5325 ++#: ../yum/__init__.py:5554 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they " -@@ -2883,158 +3023,182 @@ msgid "" +@@ -2883,158 +3085,182 @@ msgid "" "Check that the correct key URLs are configured for this repository." msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5475 ++#: ../yum/__init__.py:5705 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5477 ++#: ../yum/__init__.py:5707 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5532 ++#: ../yum/__init__.py:5762 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5549 ++#: ../yum/__init__.py:5779 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5661 ++#: ../yum/__init__.py:5891 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 ++#: ../yum/__init__.py:5952 ../yum/__init__.py:5954 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 ++#: ../yum/__init__.py:5983 ../yum/__init__.py:5985 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5779 ++#: ../yum/__init__.py:6009 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5808 ++#: ../yum/__init__.py:6038 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5810 ++#: ../yum/__init__.py:6040 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 ++#: ../yum/__init__.py:6043 ../yum/__init__.py:6179 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5822 ++#: ../yum/__init__.py:6052 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5862 ++#: ../yum/__init__.py:6092 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5866 ++#: ../yum/__init__.py:6096 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 ++#: ../yum/__init__.py:6132 ../yum/__init__.py:6149 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5944 ++#: ../yum/__init__.py:6174 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5946 ++#: ../yum/__init__.py:6176 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 ++#: ../yum/__init__.py:6251 ../yum/__init__.py:6270 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6024 ++#: ../yum/__init__.py:6254 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6045 ++#: ../yum/__init__.py:6275 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6059 ++#: ../yum/__init__.py:6289 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -136751,7 +139878,7 @@ index 97ae91a..15ddd8d 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3043,6 +3207,19 @@ msgstr "" +@@ -3043,6 +3269,19 @@ msgstr "" msgid "Repackaging" msgstr "" @@ -136760,7 +139887,7 @@ index 97ae91a..15ddd8d 100644 +msgid "Verify: %u/%u: %s" +msgstr "" + -+#: ../yum/yumRepo.py:806 ++#: ../yum/yumRepo.py:798 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" @@ -136772,10 +139899,10 @@ index 97ae91a..15ddd8d 100644 #, python-format msgid "Header cannot be opened or does not match %s, %s." diff --git a/po/zh_CN.po b/po/zh_CN.po -index 9fe1a5c..f40bfa3 100644 +index 9fe1a5c..ff272f9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2,15 +2,16 @@ +@@ -2,938 +2,948 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -136787,22 +139914,24 @@ index 9fe1a5c..f40bfa3 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/yum/team/zh_CN/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/yum/team/zh_CN/)\n" ++"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/yum/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -18,122 +19,123 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "正在升级" @@ -136813,31 +139942,31 @@ index 9fe1a5c..f40bfa3 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "正在安装" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "被取代" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "更新完毕" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "已删除" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "已安装" @@ -136864,7 +139993,7 @@ index 9fe1a5c..f40bfa3 100644 msgstr "已删除:%s" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "正在删除" @@ -136874,69 +140003,69 @@ index 9fe1a5c..f40bfa3 100644 msgstr "清理" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "命令 \"%s\" 已有定义" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "设置仓库" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "从本地文件读入仓库元数据" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "配置错误:%s" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "属性错误:%s" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr " 已安装: %s-%s 在 %s" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr " 构建 :%s 在 %s" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr " 已经提交:%s ,共 %s " -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "你需要给出命令" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "没有命令: %s。请使用 %s --help" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "磁盘要求:\n" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr " 至少需要 %d MB 以上的空间在文件系统 %s 上。\n" @@ -136946,104 +140075,106 @@ index 9fe1a5c..f40bfa3 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" -@@ -141,60 +143,60 @@ msgstr "" - "出错情况\n" - "-------------\n" +-msgstr "" +-"出错情况\n" +-"-------------\n" ++msgstr "出错情况\n-------------\n" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "尝试执行事务但无须任何处理。现在退出。" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "在用户的命令下退出" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "下载软件包:" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "下载软件包出错:\n" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" -msgstr "" +msgstr "运行事务检查" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "错误:您需要更新 rpm 以处理:" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" -msgstr "" +msgstr "事务检查与依赖解决错误:" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "RPM 需要更新" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "请在%s报告此错误" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "执行事务测试" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "事务检验出错:\n" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "事务测试成功" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "执行事务" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." -@@ -202,233 +204,248 @@ msgstr "" - "如果不加干预,拒绝自动导入密钥。\n" - "指定 \"-y\" 改变这个行为。" +-msgstr "" +-"如果不加干预,拒绝自动导入密钥。\n" +-"指定 \"-y\" 改变这个行为。" ++msgstr "如果不加干预,拒绝自动导入密钥。\n指定 \"-y\" 改变这个行为。" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr " * 也许您希望:" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "包 %s%s%s 可用,但未安装。" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "没有可用的包 %s%s%s。" @@ -137051,7 +140182,7 @@ index 9fe1a5c..f40bfa3 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "将安装的软件包" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -137059,13 +140190,13 @@ index 9fe1a5c..f40bfa3 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "无须任何处理" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "升级 %d 个软件包" @@ -137074,12 +140205,12 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "不升级任何软件包" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "已标记的欲分布同步的%d个包" @@ -137088,12 +140219,12 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "没有已标记的欲分布同步的包" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "删除 %d 个软件包" @@ -137102,27 +140233,27 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "不删除任何软件包" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "要降级的包" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "(来自 %s)" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "安装的包 %s%s%s%s 不可用。" @@ -137130,37 +140261,37 @@ index 9fe1a5c..f40bfa3 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "重装的包" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "未指定软件包" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "将安装的软件包" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" -msgstr "" +msgstr "N/S 匹配:%s" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." -msgstr "" +msgstr " 名称和简介匹配 %sonly%s,使用“search all”试试。" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." @@ -137168,127 +140299,127 @@ index 9fe1a5c..f40bfa3 100644 +msgstr " 全名和简介匹配 %sonly%s,使用“search all”试试。" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "匹配:%s" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." -msgstr "" +msgstr " 名称和简介匹配 %smonstly%s,使用“search all”试试。" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "警告:没有匹配 %s 的软件包" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "没有找到匹配的软件包" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "没有找到 %s 软件包" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "正在清理仓库: " -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "清理一切" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "清理文件头缓存" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "清理软件包" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "清理 XML 元数据" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "清理数据库缓存" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "清理过期缓存元数据" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "正在清理缓存rpmdb数据" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "清理插件" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" -msgstr "" +msgstr "警告:无组匹配:%s" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "已安装的组:" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" -msgstr "" +msgstr "安装了的语言组:" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "有效的组:" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" -msgstr "" +msgstr "可用语言组:" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "完成" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "警告:组 %s 不存在。" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "指定组中没有可安装或升级的软件包" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "安装 %d 个软件包" @@ -137297,18 +140428,18 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "没有名为 %s 的组" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "指定组中没有要删除的软件包" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "删除 %d 个软件包" @@ -137317,599 +140448,609 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "略过已安装的 %s 软件包" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "丢弃不可比较的软件包 %s.%s" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "%s 未安装,加入列表以备安装" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "插件选项" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "命令行错误:%s" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" -@@ -439,284 +456,288 @@ msgstr "" "\n" - "%s: %s 选项需要参数" + "%s: %s option requires an argument" +-msgstr "" +-"\n" +-"\n" +-"%s: %s 选项需要参数" ++msgstr "\n\n%s: %s 选项需要参数" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "--color 需要参数:auto, always, never" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" -msgstr "" +msgstr "-- 安装根必须是绝对路径:%s" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "显示此帮助消息并退出" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "容忍错误" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "完全从系统缓存运行,不升级缓存" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "配置文件路径" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "命令最长等待时间" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "调试输出级别" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "在 list/search 命令下,显示仓库里重复的条目" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "错误输出级别" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "rpm调试输出等级" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "安静的操作" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "详尽的操作过程" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "回答所有的问题为是" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "显示 Yum 版本信息并退出" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "设置目标根目录" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "启用一个或多个仓库(支持通配符)" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "禁用一个或多个仓库(支持通配符)" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "用全名或通配符排除软件包" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "禁止从主配置,从仓库或者从任何位置排除" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "升级时考虑软件包取代关系" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "禁用 Yum 插件" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "禁用 gpg 签名检测" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "禁用指定名称的插件" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "由名称启用插件" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "跳过有依赖问题的软件包" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "配置是否使用颜色" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "在yum配置和repo文件里设置$releasever的值" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "设置任意配置和仓库选项" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "一月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "二月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "三月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "四月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "五月" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "六月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "七月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "八月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "九月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "十月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "十一月" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "十二月" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "尝试其他镜像。" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "名称 :%s%s%s" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "构架 :%s" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "时期 : %s" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "版本 :%s" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "发布 :%s" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "大小 :%s" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "仓库 :%s" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "来自仓库 :%s" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "提交者 :%s" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "提交时间 :%s" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "构建时间:%s" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "安装时间:%s" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "由 %s 安装" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "由 %s 修改" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "简介 : " -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "网址 :%s" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "协议 : " -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "描述: " -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "y" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "是" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "n" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "否" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "确定吗?[y/N]:" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" -@@ -725,154 +746,155 @@ msgstr "" - "\n" - "组:%s" + "Group: %s" +-msgstr "" +-"\n" +-"组:%s" ++msgstr "\n组:%s" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr " 组编号:%s" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr " 描述:%s" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" -msgstr "" +msgstr " 语言:%s" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr " 必要的软件包:" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr " 默认的软件包:" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr " 可选的软件包:" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr " 可能的软件包:" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "软件包:%s" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr " 此软件包无依赖关系" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr " 依赖: %s" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr " 不满足的依赖关系" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "匹配来自于:" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "协议 :%s" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "文件名 :%s" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "其他 : " -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "计算总下载量时出错" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "总文件大小:%s" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "总下载量:%s" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "安装大小:%s" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "有一个错误计算安装大小" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "重新安装" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "正在降级" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "为依赖而安装" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "为依赖而更新" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "为依赖而移除" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "跳过(依赖问题)" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "未安装" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" -msgstr "" +msgstr "不可用" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "软件包" +msgid_plural "Packages" +msgstr[0] "软件包" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "架构" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "版本" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "仓库" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "大小" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr " 替换 %s%s%s.%s %s\n" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" -@@ -883,57 +905,57 @@ msgstr "" - "事务概要\n" + "Transaction Summary\n" "%s\n" +-msgstr "" +-"\n" +-"事务概要\n" +-"%s\n" ++msgstr "\n事务概要\n%s\n" -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -msgstr "安装 %5.5s 个包\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" +msgstr "安装" @@ -137917,7 +141058,7 @@ index 9fe1a5c..f40bfa3 100644 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -msgstr "升级 %5.5s 个包\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" +msgstr "" @@ -137925,7 +141066,7 @@ index 9fe1a5c..f40bfa3 100644 -#, python-format -msgid "Remove %5.5s Package(s)\n" -msgstr "移除 %5.5s 个包\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" +msgstr "" @@ -137933,7 +141074,7 @@ index 9fe1a5c..f40bfa3 100644 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -msgstr "重新安装 %5.5s 个包\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" +msgstr "重新安装" @@ -137941,329 +141082,333 @@ index 9fe1a5c..f40bfa3 100644 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -msgstr "降级 %5.5s 个包\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" +msgstr "降级" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "删除" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "作为依赖被删除" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "作为依赖被安装" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "作为依赖被升级" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "替代" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "失败" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "二" -@@ -941,7 +963,7 @@ msgstr "二" +@@ -941,574 +951,610 @@ msgstr "二" #. Current download cancelled, interrupt (ctrl-c) again within two seconds #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -952,364 +974,416 @@ msgstr "" - " 当前下载已取消,再次输入%s个中断(ctrl-c)%s于 %s%s%s 秒内\n" - "以退出。\n" + " Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n" + "to exit.\n" +-msgstr "" +-"\n" +-" 当前下载已取消,再次输入%s个中断(ctrl-c)%s于 %s%s%s 秒内\n" +-"以退出。\n" ++msgstr "\n 当前下载已取消,再次输入%s个中断(ctrl-c)%s于 %s%s%s 秒内\n以退出。\n" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "用户中断" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "总计" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "I" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "O" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "E" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "R" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "D" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "U" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "<空>" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "系统" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" -msgstr "" +msgstr "跳过合并事务 %d 到 %d,因为它俩重叠" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" -msgstr "" +msgstr "没有事务" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "错误的事务 ID 或软件包" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" -msgstr "" +msgstr "命令行" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "登陆用户" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "ID" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "日期和时间" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "操作" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "更改" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "没有事务 ID" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "错误的事务 ID" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "未能找到指定事务 ID" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "找到多个事务 ID!" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "未指定事务 ID、或者软件包" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "降级" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "较老的" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "较早的" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "事务 ID:" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "起始时间 :" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "启动 rpmdb :" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" -msgstr "" +msgstr "(%u 秒)" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" -msgstr "" +msgstr "(%u 分钟)" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" -msgstr "" +msgstr "(%u 小时)" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" -msgstr "" +msgstr "(%u 天)" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "结束时间 :" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "结束 rpmdb :" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "用户 :" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "返回码 :" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "已终止" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" -msgstr "" +msgstr "失败:" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "失败:" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "成功" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "命令行 :" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "其他非默认信息已保存:%d" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "事务完成由:" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "已改变的包:" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "已跳过的包:" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "Rpmdb 问题:" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "Scriptlet 输出:" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "错误:" @@ -138272,17 +141417,17 @@ index 9fe1a5c..f40bfa3 100644 -msgstr "安装" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "依赖安装" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "取代中" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "抹去" @@ -138295,300 +141440,314 @@ index 9fe1a5c..f40bfa3 100644 -msgstr "降级" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "更新" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "时间" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "最近一天" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "最近一周" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "最近2周" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "最近3个月" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "最近6个月" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "最近一年" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "一年以前" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "未找到事务 %s" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "事务 ID:" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "可用的额外历史信息:" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "%s: 未找到符合该名称的额外数据" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "安装" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" -msgstr "" +msgstr "一个更新" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "删除" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "已重新安装" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" -msgstr "" +msgstr "一个降级" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" -msgstr "" +msgstr "舍弃" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "升级" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "取代" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" -msgstr "" +msgstr "---> 软件包 %s.%s.%s.%s-%s 将被 %s" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "--> 执行事务检查" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "--> 使用新的信息重新计算依赖关系。" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "--> 完成依赖关系计算" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "--> 处理依赖关系 %s,它被软件包 %s 需要" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "---> 保留软件包: %s" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "--> 无法解决的依赖:%s" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "软件包:%s" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" -@@ -1318,7 +1392,7 @@ msgstr "" - "\n" - " 需要:%s" + " Requires: %s" +-msgstr "" +-"\n" +-" 需要:%s" ++msgstr "\n 需要:%s" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" -@@ -1327,7 +1401,7 @@ msgstr "" - "\n" " %s: %s (%s)" +-msgstr "" +-"\n" +-" %s: %s (%s)" ++msgstr "\n %s: %s (%s)" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" -@@ -1336,7 +1410,7 @@ msgstr "" - "\n" " %s" +-msgstr "" +-"\n" +-" %s" ++msgstr "\n %s" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" -@@ -1345,85 +1419,85 @@ msgstr "" - " 未找到" +-msgstr "" +-"\n" +-" 未找到" ++msgstr "\n 未找到" #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "更新,由" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "降级,由" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "取代,由" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "可用" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "--> 处理 %s 与 %s 的冲突" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "--> 根据指定的软件包创建事务,请等待。" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "---> 下载 %s 的文件头作为事务的一部分。" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "运行中" @@ -138614,7 +141773,7 @@ index 9fe1a5c..f40bfa3 100644 msgstr "跟踪/停止" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "未知" @@ -138652,27 +141811,37 @@ index 9fe1a5c..f40bfa3 100644 msgid "" "\n" "\n" -@@ -1433,7 +1507,7 @@ msgstr "" - "\n" - "由于用户取消而退出" + "Exiting on user cancel" +-msgstr "" +-"\n" +-"\n" +-"由于用户取消而退出" ++msgstr "\n\n由于用户取消而退出" -#: ../utils.py:176 ../yummain.py:49 +#: ../utils.py:208 ../yummain.py:49 msgid "" "\n" "\n" -@@ -1443,7 +1517,7 @@ msgstr "" - "\n" - "由于管道被破坏而退出" + "Exiting on Broken Pipe" +-msgstr "" +-"\n" +-"\n" +-"由于管道被破坏而退出" ++msgstr "\n\n由于管道被破坏而退出" -#: ../utils.py:178 ../yummain.py:51 +#: ../utils.py:210 ../yummain.py:51 #, python-format msgid "" "\n" -@@ -1454,41 +1528,41 @@ msgstr "" "\n" "%s" +-msgstr "" +-"\n" +-"\n" +-"%s" ++msgstr "\n\n%s" -#: ../utils.py:228 ../yummain.py:123 +#: ../utils.py:286 ../yummain.py:134 @@ -138720,9 +141889,10 @@ index 9fe1a5c..f40bfa3 100644 msgid "" "\n" "Dependencies Resolved" -@@ -1496,19 +1570,19 @@ msgstr "" - "\n" - "依赖关系解决" +-msgstr "" +-"\n" +-"依赖关系解决" ++msgstr "\n依赖关系解决" -#: ../utils.py:376 ../yummain.py:234 +#: ../utils.py:448 ../yummain.py:251 @@ -138743,9 +141913,20 @@ index 9fe1a5c..f40bfa3 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1533,53 +1607,53 @@ msgstr "" +@@ -1523,577 +1569,592 @@ msgid "" + "will install it for you.\n" "\n" - "详情请联系您的发行版或软件包制作人。\n" + "For more information contact your distribution or package provider.\n" +-msgstr "" +-"\n" +-"您启用了软件包 GPG 签名检测,这样很好。但是,您尚未安装任何 GPG 公钥。请下载您希望安装的软件的签名公钥并安装。假设公钥已下载,安装命令是:\n" +-" rpm --import public.gpg.key\n" +-"\n" +-"\n" +-"或者,在仓库配置中,使用 'gpgkey' 选项指定仓库使用的公钥的 URL,这样 yum 会自动安装它。\n" +-"\n" +-"详情请联系您的发行版或软件包制作人。\n" ++msgstr "\n您启用了软件包 GPG 签名检测,这样很好。但是,您尚未安装任何 GPG 公钥。请下载您希望安装的软件的签名公钥并安装。假设公钥已下载,安装命令是:\n rpm --import public.gpg.key\n\n\n或者,在仓库配置中,使用 'gpgkey' 选项指定仓库使用的公钥的 URL,这样 yum 会自动安装它。\n\n详情请联系您的发行版或软件包制作人。\n" -#: ../yumcommands.py:74 +#: ../yumcommands.py:80 @@ -138809,9 +141990,12 @@ index 9fe1a5c..f40bfa3 100644 msgid "" "There are no enabled repos.\n" " Run \"yum repolist all\" to see the repos you have.\n" -@@ -1589,306 +1663,295 @@ msgstr "" - "执行 \"yum repolist all\" 查看您拥有的仓库。\n" - "您可以用 yum-config-manager --enable <仓库名> 来启用仓库" + " You can enable repos with yum-config-manager --enable " +-msgstr "" +-"没有已启用的仓库。\n" +-"执行 \"yum repolist all\" 查看您拥有的仓库。\n" +-"您可以用 yum-config-manager --enable <仓库名> 来启用仓库" ++msgstr "没有已启用的仓库。\n执行 \"yum repolist all\" 查看您拥有的仓库。\n您可以用 yum-config-manager --enable <仓库名> 来启用仓库" -#: ../yumcommands.py:200 +#: ../yumcommands.py:300 @@ -139043,120 +142227,120 @@ index 9fe1a5c..f40bfa3 100644 msgstr "显示已配置的仓库" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "启用" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "禁用" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "仓库ID : " -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "仓库名 : " -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "仓库状态 : " -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "仓库版本: " -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "仓库标志 : " -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "仓库发行版标签: " -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "仓库更新: " -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "仓库包 : " -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "仓库大小 : " -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "仓库基本地址: " -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "仓库元链接:" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "更新:" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "仓库镜像:" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "从不 (最后 %s)" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "瞬间(最后%s)" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "%s 秒 (最后 %s)" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "仓库到期:" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "仓库排除:" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "仓库包括:" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "仓库除外:" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " -msgstr "" +msgstr "仓库文件名:" @@ -139164,191 +142348,197 @@ index 9fe1a5c..f40bfa3 100644 #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "仓库标识" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "状态" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "仓库名称" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "显示用法信息" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "没有关于 %s 的帮助" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" -@@ -1898,7 +1961,7 @@ msgstr "" - "\n" - "别名:" + "aliases: " +-msgstr "" +-"\n" +-"\n" +-"别名:" ++msgstr "\n\n别名:" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" -@@ -1908,115 +1971,161 @@ msgstr "" - "\n" - "别名:" + "alias: " +-msgstr "" +-"\n" +-"\n" +-"别名:" ++msgstr "\n\n别名:" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "设置覆盖安装进程" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "覆盖安装一个包" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "设置降级过程" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "降级包" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "显示机器和/或可用的仓库版本。" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr " Yum版本组:" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr " 组 :" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr " 包:" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "已安装:" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "组已安装:" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "可用:" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "组内现有:" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "显示或使用事务历史" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "无效的历史子命令,使用:%s。" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "你没有权限到历史数据。" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "检查rpmdb里的问题" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" -msgstr "" +msgstr "从文件名中加载一个已存事务" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." -msgstr "" +msgstr "指定文件中没有已存事务。" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" -msgstr "" +msgstr "正在从 %s 中加载事务" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" -msgstr "" @@ -139398,278 +142588,283 @@ index 9fe1a5c..f40bfa3 100644 msgid "" "\n" "\n" -@@ -2026,74 +2135,74 @@ msgstr "" - "\n" - "由于用户取消而退出。" + "Exiting on user cancel." +-msgstr "" +-"\n" +-"\n" +-"由于用户取消而退出。" ++msgstr "\n\n由于用户取消而退出。" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "doTsSetup() 将从未来版本的 Yum 中去掉。\n" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "在配置可用前设置事务集" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "配置文件 %s 中使用 tsflag 是错误的" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "搜索群集中 %s 的依赖关系" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "成员:%s" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "%s 转为安装" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "添加软件包 %s 到 %s 模式" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "正在删除软件包 %s" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "%s 需要:%s" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "%s 需要 %s" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "已查询过所需的依赖关系,跳过" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "所需的依赖关系并非软件包名称。搜索:%s" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr " 可能的提供者:%s" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "模式 %s 被用于提供 %s 的软件包:%s" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "提供 %s 的软件包使用的模式:%s" -@@ -2101,114 +2210,114 @@ msgstr "提供 %s 的软件包使用的模式:%s" +@@ -2101,1000 +2162,1027 @@ msgstr "提供 %s 的软件包使用的模式:%s" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" -msgstr "" +msgstr "尝试升级 %s 来解决依赖" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" -msgstr "" +msgstr "未为 %s 找到更新路径。失败!" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "事务:%s 软件包要求删除 %s" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "事务:令 %s 被 %s 取代以解决依赖关系。" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "事务:更新 %s 以解决依赖。" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "无法找到 %s 依赖的更新路径" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "快速匹配 %s 到 %s 的需求" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "提供 %s 的软件包存在而且已被安装,不再检测。" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "可能解决依赖的 %s 软件包已经有更新的版本存在于事务中了。" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "可能解决依赖的 %s 软件包已经有更新的版本安装过了。" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "%s 已包含在事务中,不再重复" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "事务:将 %s 作为 %s 的更新" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "事务:将 %s 作为 %s 安装" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "成功 - 空的事务" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "重新开始循环" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "依赖进程即将完成" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "成功 - 依赖关系解决" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "检查 %s 的依赖关系" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "搜索 %s 作为 %s 的依赖关系" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "为 %s 运行 compare_providers()" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "%s 提供了更好的架构选择" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "%s 取代 %s" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" -@@ -2217,162 +2326,162 @@ msgstr "" - "比较 %s 与 %s 架构差异,在 %s\n" - " 胜者:%s" + " Winner: %s" +-msgstr "" +-"比较 %s 与 %s 架构差异,在 %s\n" +-" 胜者:%s" ++msgstr "比较 %s 与 %s 架构差异,在 %s\n 胜者:%s" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "%s 和 %s 具有共同的源代码 rpm" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "基础软件包 %s 由于 %s 已经安装" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "共同的前缀 %s 存在于 %s 和 %s 之间" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "最小需求: %d" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr " 胜者:%s" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr " 负者( %d):%s" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "最佳顺序:%s" @@ -139828,9 +143023,10 @@ index 9fe1a5c..f40bfa3 100644 msgid "" "\n" "Packages skipped because of dependency problems:" -@@ -2380,562 +2489,570 @@ msgstr "" - "\n" - "因为依赖关系问题而跳过的软件包:" +-msgstr "" +-"\n" +-"因为依赖关系问题而跳过的软件包:" ++msgstr "\n因为依赖关系问题而跳过的软件包:" -#: ../yum/__init__.py:1221 +#: ../yum/__init__.py:1305 @@ -139886,7 +143082,7 @@ index 9fe1a5c..f40bfa3 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "%s 假定被安装但并非这样!" @@ -139897,24 +143093,22 @@ index 9fe1a5c..f40bfa3 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "%s 假定被移除但并非这样!" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 - #, python-format - msgid "Could not open lock %s: %s" - msgstr "不能打开锁 %s : %s" - - #. Whoa. What the heck happened? +-#, python-format +-msgid "Could not open lock %s: %s" +-msgstr "不能打开锁 %s : %s" +- +-#. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 - #, python-format - msgid "Unable to check if PID %s is active" - msgstr "无法检测 PID %s 是否激活" - +-#, python-format +-msgid "Unable to check if PID %s is active" +-msgstr "无法检测 PID %s 是否激活" +- #. Another copy seems to be running. -#: ../yum/__init__.py:1789 +#: ../yum/__init__.py:1917 @@ -139924,13 +143118,25 @@ index 9fe1a5c..f40bfa3 100644 #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1966 #, python-format msgid "Could not create lock at %s: %s " msgstr "无法在 %s 创建锁:%s" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:1978 ++#, python-format ++msgid "Could not open lock %s: %s" ++msgstr "不能打开锁 %s : %s" ++ ++#. The pid doesn't exist ++#. Whoa. What the heck happened? ++#: ../yum/__init__.py:1995 ++#, python-format ++msgid "Unable to check if PID %s is active" ++msgstr "无法检测 PID %s 是否激活" ++ ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -139938,23 +143144,23 @@ index 9fe1a5c..f40bfa3 100644 msgstr "软件包与预期下载的不符。建议:运行 yum --enablerepo=%s clean metadata" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "无法执行校验和" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "软件包校验和不匹配" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "软件包校验和失败但是 %s 已启用缓存" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "使用本地的 %s 副本" @@ -139971,67 +143177,67 @@ index 9fe1a5c..f40bfa3 100644 -" * 需要 %s" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "文件头不完整。" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "文件头不在本地缓存中,但是因为处于只使用缓存的模式,无法下载 %s" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "%s 的公钥没有安装" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "打开软件包 %s 出现问题" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "%s 的公钥不可信任" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "软件包 %s 没有签名" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "无法删除 %s" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "%s 已删除" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "无法删除 %s 文件 %s" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "%s 文件 %s 已删除" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "%d %s 文件已删除" @@ -140040,26 +143246,26 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "群集中有超过一个相同的匹配 %s" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "更新不包括匹配 %s.%s %s:%s-%s 的内容" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "searchPackages() 将从未来版本的 Yum 中去掉,被searchGenerator() 替代。\n" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "搜索 %d 个软件包" @@ -140068,63 +143274,63 @@ index 9fe1a5c..f40bfa3 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "搜索 %s 软件包" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "在文件中搜索" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "在可提供的依赖中搜索" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "配置的软件仓库不包含组数据" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "不存在 %s 组" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "软件包 %s 没有包含在 %s 组中" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "添加包 %s 从组 %s 中" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "找不到名为 %s 的软件包来安装" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." -msgstr "" +msgstr "警告:%s 组不包含任何包。" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." -msgstr "" @@ -140133,80 +143339,80 @@ index 9fe1a5c..f40bfa3 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "群集中找不到软件包 %s" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "rpmdb 中找不到软件包元组 %s" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" -msgstr "" +msgstr "来自 %s 的无效版本标志" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "找不到 %s 软件包" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "不是一个软件包对象的实例" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "没有指定要安装的内容" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "检测 %s 提供的依赖或文件" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "参数 %s 没有匹配" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "包 %s 已安装且不可用" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "没有包可供安装" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "软件包 %s 已包含在事务中" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "软件包 %s 被已安装的 %s 取代" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -140214,62 +143420,62 @@ index 9fe1a5c..f40bfa3 100644 msgstr "软件包 %s 已经被 %s 取代,但是取代的软件包并未满足需求" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "软件包 %s 已经被 %s 取代,改为尝试安装 %s" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "包 %s 已安装并且是最新版本" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "匹配 %s 的软件包已经安装。检查更新。" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "全部升级" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "不更新已被取代的软件包:%s.%s %s:%s-%s" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "%s" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "包已被取代:%s.%s %s:%s-%s" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "未更新已被废除的软件包:%s" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "未更新已被更新的软件包:%s.%s %s:%s-%s" @@ -140277,56 +143483,56 @@ index 9fe1a5c..f40bfa3 100644 -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -msgstr "没有匹配的要删除的包" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" +msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "跳过正在运行的内核:%ss" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "从操作中移除 %s" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "无法打开 %s ,跳过。" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "诊断 %s: %s" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "无法本地安装 deltarpm %s ,跳过。" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "无法添加软件包 %s 到操作中。不属于可兼容的架构:%s" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "无法安装软件包 %s 。被已安装软件包 %s 标识为废除" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -140334,7 +143540,7 @@ index 9fe1a5c..f40bfa3 100644 msgstr "软件包 %s 没有安装,不能更新。运行 yum install 安装它。" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -140343,121 +143549,121 @@ index 9fe1a5c..f40bfa3 100644 +msgstr "软件包 %s.%s 未安装,不能更新它。替代方案是运行 yum install 安装。" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "排除 %s" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "%s 将被安装" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "%s 将作为 %s 的更新" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "%s:不更新已安装的软件包。" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "无法打开文件:%s。跳过。" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "覆盖安装出错:没有匹配的要删除的软件包" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "重新安装出错:没有匹配的软件包 %s 来安装" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "没有可供降级的软件包" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "软件包 %s 允许同时安装多个版本,跳过" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "未找到匹配的可用软件包:%s" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "只更新可用软件包:%s" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "降级失败:%s" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 #, python-format -msgid "Retrieving key from %s" +msgid "Failed to upgrade: %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 +#, python-format +msgid "Retrieving key from %s" +msgstr "从 %s 检索密钥" + -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "获取 GPG 密钥失败:" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" -msgstr "" +msgstr "密钥 %s 上的 GPG 密钥签名与 %s 仓库的 CA 密钥不匹配" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" -msgstr "" +msgstr "GPG 密钥签名验证与 CA 密钥冲突" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "来自 %s 的不可用 GPG 密钥:%s" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "GPG 密钥传递失败:密钥未包含值 %s" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -140471,7 +143677,7 @@ index 9fe1a5c..f40bfa3 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -140483,30 +143689,30 @@ index 9fe1a5c..f40bfa3 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "%s 的 GPG 密钥(0x%s)已安装" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "导入密钥失败(代码 %d)" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "导入密钥成功" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" -msgstr "" +msgstr "没有安装任何键" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -140514,160 +143720,162 @@ index 9fe1a5c..f40bfa3 100644 msgstr "仓库 \"%s\" 的 GPG 密钥已安装,但是不适用于此软件包。请检查仓库的公钥 URL 是否配置正确。" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "导入的密钥没有用处,错误的密钥?" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "位于 %s 的 GPG 密钥 (0x%s) 已经导入" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "导入密钥失败" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" -msgstr "" +msgstr "没有对 %s 仓库安装任何键" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" -@@ -2944,157 +3061,181 @@ msgstr "" - "\"%s\" 仓库列出的 GPG 密钥已经安装但并不正确。\n" - "请检查此仓库正确的密钥 URL 配置。" + "Check that the correct key URLs are configured for this repository." +-msgstr "" +-"\"%s\" 仓库列出的 GPG 密钥已经安装但并不正确。\n" +-"请检查此仓库正确的密钥 URL 配置。" ++msgstr "\"%s\" 仓库列出的 GPG 密钥已经安装但并不正确。\n请检查此仓库正确的密钥 URL 配置。" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "不能发现合适的镜像。" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "下载软件包时出错。" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "请在 %s 报告这个错误" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "事务测试出错:" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "不能置缓存目录:%s" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." -msgstr "" +msgstr "依赖没有解决。将不会保存未解决事务。" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" -msgstr "" +msgstr "不能保存事务文件 %s:%s" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" -msgstr "" +msgstr "不能访问或都去已存事务 %s:%s" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " -msgstr "" +msgstr "RPM数据库版本与已存事务版本不匹配, " -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." -msgstr "" +msgstr " 忽略,作为请求。" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." -msgstr "" +msgstr " 终止。" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." -msgstr "" +msgstr "不能找到 tsflags 或 tsflags 非整数。" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" -msgstr "" +msgstr "在未知当前状态找到 txmbr:%s" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" -msgstr "" +msgstr "不能找到 txmbr:在 %s 状态中 %s" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" -msgstr "" +msgstr "不能找到 txmbr:来自原地 %s 的 %s" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," -msgstr "" +msgstr "事务成员、关系缺失或 ts 已被修改," -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" +msgstr " 忽略,作为请求。您必须解决依赖!" + +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." msgstr "" @@ -140767,29 +143975,37 @@ index 9fe1a5c..f40bfa3 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "%s 提供 %s 但不能被找到" -@@ -3103,6 +3244,17 @@ msgstr "%s 提供 %s 但不能被找到" +@@ -3103,6 +3191,19 @@ msgstr "%s 提供 %s 但不能被找到" msgid "Repackaging" msgstr "正在重新包装" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" +"Insufficient space in download directory %s\n" +" * free %s\n" +" * needed %s" -+msgstr "" -+"下载目录 %s 空间不足\n" -+" * 空闲 %s\n" -+" * 需要 %s" ++msgstr "下载目录 %s 空间不足\n * 空闲 %s\n * 需要 %s" + #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3131,5 +3232,3 @@ msgstr "损坏的文件头 %s" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "打开 RPM %s 错误 - 错误 %s" +- +- diff --git a/po/zh_TW.po b/po/zh_TW.po -index 704a726..c970fec 100644 +index 704a726..05fe6bf 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po -@@ -2,13 +2,14 @@ +@@ -2,427 +2,444 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -140797,22 +144013,24 @@ index 704a726..c970fec 100644 msgid "" msgstr "" "Project-Id-Version: Yum\n" - "Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" +-"Report-Msgid-Bugs-To: http://yum.baseurl.org/\n" -"POT-Creation-Date: 2011-06-06 10:21-0400\n" -"PO-Revision-Date: 2011-06-06 14:21+0000\n" -"Last-Translator: skvidal \n" -+"POT-Creation-Date: 2011-10-17 17:36-0400\n" -+"PO-Revision-Date: 2011-10-17 21:40+0000\n" +-"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/yum/team/zh_TW/)\n" ++"Report-Msgid-Bugs-To: http://bugzilla.redhat.com/\n" ++"POT-Creation-Date: 2011-12-02 15:28-0500\n" ++"PO-Revision-Date: 2011-12-02 20:29+0000\n" +"Last-Translator: james \n" - "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/yum/team/zh_TW/)\n" ++"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/yum/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -@@ -16,413 +17,429 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73 -+#: ../callback.py:45 ../output.py:1355 ../yum/rpmtrans.py:73 ++#: ../callback.py:45 ../output.py:1367 ../yum/rpmtrans.py:73 msgid "Updating" msgstr "" @@ -140823,31 +144041,31 @@ index 704a726..c970fec 100644 -#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036 -#: ../output.py:2218 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 -+#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1354 -+#: ../output.py:2776 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 ++#: ../callback.py:47 ../callback.py:48 ../callback.py:50 ../output.py:1366 ++#: ../output.py:2782 ../yum/rpmtrans.py:75 ../yum/rpmtrans.py:76 #: ../yum/rpmtrans.py:78 msgid "Installing" msgstr "" -#: ../callback.py:52 ../callback.py:58 ../output.py:1840 ../yum/rpmtrans.py:77 -+#: ../callback.py:49 ../callback.py:55 ../output.py:2233 ../yum/rpmtrans.py:77 ++#: ../callback.py:49 ../callback.py:55 ../output.py:2239 ../yum/rpmtrans.py:77 msgid "Obsoleted" msgstr "" -#: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847 -+#: ../callback.py:51 ../output.py:1528 ../output.py:2075 ../output.py:2240 ++#: ../callback.py:51 ../output.py:1535 ../output.py:2082 ../output.py:2246 msgid "Updated" msgstr "" -#: ../callback.py:55 ../output.py:1685 -+#: ../callback.py:52 ../output.py:2074 ++#: ../callback.py:52 ../output.py:2081 msgid "Erased" msgstr "" -#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1167 -#: ../output.py:1685 ../output.py:1687 ../output.py:2190 -+#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1526 -+#: ../output.py:2074 ../output.py:2076 ../output.py:2748 ++#: ../callback.py:53 ../callback.py:54 ../callback.py:56 ../output.py:1533 ++#: ../output.py:2081 ../output.py:2083 ../output.py:2754 msgid "Installed" msgstr "" @@ -140874,7 +144092,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../callback.py:217 ../output.py:1038 ../output.py:2193 -+#: ../callback.py:229 ../output.py:1356 ../output.py:2751 ++#: ../callback.py:229 ../output.py:1368 ../output.py:2757 msgid "Removing" msgstr "" @@ -140884,69 +144102,69 @@ index 704a726..c970fec 100644 msgstr "" -#: ../cli.py:115 -+#: ../cli.py:118 ++#: ../cli.py:120 #, python-format msgid "Command \"%s\" already defined" msgstr "" -#: ../cli.py:127 -+#: ../cli.py:133 ++#: ../cli.py:135 msgid "Setting up repositories" msgstr "" -#: ../cli.py:138 -+#: ../cli.py:144 ++#: ../cli.py:146 msgid "Reading repository metadata in from local files" msgstr "" -#: ../cli.py:245 ../utils.py:281 -+#: ../cli.py:269 ../cli.py:273 ../utils.py:346 ++#: ../cli.py:271 ../cli.py:275 ../utils.py:346 #, python-format msgid "Config Error: %s" msgstr "" -#: ../cli.py:248 ../cli.py:1584 ../utils.py:284 -+#: ../cli.py:276 ../cli.py:1970 ../utils.py:349 ++#: ../cli.py:278 ../cli.py:1973 ../utils.py:349 #, python-format msgid "Options Error: %s" msgstr "" -#: ../cli.py:293 -+#: ../cli.py:323 ++#: ../cli.py:325 #, python-format msgid " Installed: %s-%s at %s" msgstr "" -#: ../cli.py:295 -+#: ../cli.py:325 ++#: ../cli.py:327 #, python-format msgid " Built : %s at %s" msgstr "" -#: ../cli.py:297 -+#: ../cli.py:327 ++#: ../cli.py:329 #, python-format msgid " Committed: %s at %s" msgstr "" -#: ../cli.py:336 -+#: ../cli.py:368 ++#: ../cli.py:370 msgid "You need to give some command" msgstr "" -#: ../cli.py:350 -+#: ../cli.py:382 ++#: ../cli.py:384 #, python-format msgid "No such command: %s. Please use %s --help" msgstr "" -#: ../cli.py:400 -+#: ../cli.py:440 ++#: ../cli.py:442 msgid "Disk Requirements:\n" msgstr "" -#: ../cli.py:402 -+#: ../cli.py:442 ++#: ../cli.py:444 #, python-format msgid " At least %dMB more space needed on the %s filesystem.\n" -msgstr "" @@ -140956,98 +144174,98 @@ index 704a726..c970fec 100644 #. TODO: simplify the dependency errors? #. Fixup the summary -#: ../cli.py:407 -+#: ../cli.py:447 ++#: ../cli.py:449 msgid "" "Error Summary\n" "-------------\n" msgstr "" -#: ../cli.py:450 -+#: ../cli.py:495 ++#: ../cli.py:497 msgid "Trying to run the transaction but nothing to do. Exiting." msgstr "" -#: ../cli.py:497 -+#: ../cli.py:542 ++#: ../cli.py:544 msgid "Exiting on user Command" msgstr "" -#: ../cli.py:501 -+#: ../cli.py:546 ++#: ../cli.py:548 msgid "Downloading Packages:" msgstr "" -#: ../cli.py:506 -+#: ../cli.py:551 ++#: ../cli.py:553 msgid "Error Downloading Packages:\n" msgstr "" -#: ../cli.py:525 ../yum/__init__.py:4967 -+#: ../cli.py:570 ../yum/__init__.py:5491 ++#: ../cli.py:572 ../yum/__init__.py:5518 msgid "Running Transaction Check" msgstr "" -#: ../cli.py:534 ../yum/__init__.py:4976 -+#: ../cli.py:579 ../yum/__init__.py:5500 ++#: ../cli.py:581 ../yum/__init__.py:5527 msgid "ERROR You need to update rpm to handle:" msgstr "" -#: ../cli.py:536 ../yum/__init__.py:4979 -+#: ../cli.py:581 ../yum/__init__.py:5503 ++#: ../cli.py:583 ../yum/__init__.py:5530 msgid "ERROR with transaction check vs depsolve:" msgstr "" -#: ../cli.py:542 -+#: ../cli.py:587 ++#: ../cli.py:589 msgid "RPM needs to be updated" msgstr "" -#: ../cli.py:543 -+#: ../cli.py:588 ++#: ../cli.py:590 #, python-format msgid "Please report this error in %s" msgstr "" -#: ../cli.py:549 -+#: ../cli.py:594 ++#: ../cli.py:596 msgid "Running Transaction Test" msgstr "" -#: ../cli.py:561 -+#: ../cli.py:606 ++#: ../cli.py:608 msgid "Transaction Check Error:\n" msgstr "" -#: ../cli.py:568 -+#: ../cli.py:613 ++#: ../cli.py:615 msgid "Transaction Test Succeeded" msgstr "" -#: ../cli.py:600 -+#: ../cli.py:645 ++#: ../cli.py:647 msgid "Running Transaction" msgstr "" -#: ../cli.py:630 -+#: ../cli.py:678 ++#: ../cli.py:680 msgid "" "Refusing to automatically import keys when running unattended.\n" "Use \"-y\" to override." msgstr "" -#: ../cli.py:649 ../cli.py:692 -+#: ../cli.py:697 ../cli.py:740 ++#: ../cli.py:699 ../cli.py:742 msgid " * Maybe you meant: " msgstr "" -#: ../cli.py:675 ../cli.py:683 -+#: ../cli.py:723 ../cli.py:731 ++#: ../cli.py:725 ../cli.py:733 #, python-format msgid "Package(s) %s%s%s available, but not installed." msgstr "" -#: ../cli.py:689 ../cli.py:722 ../cli.py:908 -+#: ../cli.py:737 ../cli.py:821 ../cli.py:1058 ++#: ../cli.py:739 ../cli.py:823 ../cli.py:1061 #, python-format msgid "No package %s%s%s available." msgstr "" @@ -141055,7 +144273,7 @@ index 704a726..c970fec 100644 -#: ../cli.py:729 ../cli.py:973 -msgid "Package(s) to install" -msgstr "" -+#: ../cli.py:830 ++#: ../cli.py:832 +#, python-format +msgid "%d package to install" +msgid_plural "%d packages to install" @@ -141063,13 +144281,13 @@ index 704a726..c970fec 100644 -#: ../cli.py:732 ../cli.py:733 ../cli.py:914 ../cli.py:948 ../cli.py:974 -#: ../yumcommands.py:190 -+#: ../cli.py:833 ../cli.py:834 ../cli.py:1065 ../cli.py:1115 ../cli.py:1150 ++#: ../cli.py:835 ../cli.py:836 ../cli.py:1068 ../cli.py:1118 ../cli.py:1153 +#: ../yumcommands.py:268 msgid "Nothing to do" msgstr "" -#: ../cli.py:767 -+#: ../cli.py:884 ++#: ../cli.py:886 #, python-format -msgid "%d packages marked for Update" -msgstr "" @@ -141078,12 +144296,12 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../cli.py:770 -+#: ../cli.py:886 ++#: ../cli.py:888 msgid "No Packages marked for Update" msgstr "" -#: ../cli.py:866 -+#: ../cli.py:997 ++#: ../cli.py:1000 #, python-format -msgid "%d packages marked for Distribution Synchronization" -msgstr "" @@ -141092,12 +144310,12 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../cli.py:869 -+#: ../cli.py:999 ++#: ../cli.py:1002 msgid "No Packages marked for Distribution Synchronization" msgstr "" -#: ../cli.py:885 -+#: ../cli.py:1025 ++#: ../cli.py:1028 #, python-format -msgid "%d packages marked for removal" -msgstr "" @@ -141106,27 +144324,27 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../cli.py:888 -+#: ../cli.py:1027 ++#: ../cli.py:1030 msgid "No Packages marked for removal" msgstr "" -#: ../cli.py:913 -msgid "Package(s) to downgrade" -msgstr "" -+#: ../cli.py:1064 ++#: ../cli.py:1067 +#, python-format +msgid "%d package to downgrade" +msgid_plural "%d packages to downgrade" +msgstr[0] "" -#: ../cli.py:938 -+#: ../cli.py:1101 ++#: ../cli.py:1104 #, python-format msgid " (from %s)" msgstr "" -#: ../cli.py:939 -+#: ../cli.py:1102 ++#: ../cli.py:1105 #, python-format msgid "Installed package %s%s%s%s not available." msgstr "" @@ -141134,158 +144352,158 @@ index 704a726..c970fec 100644 -#: ../cli.py:947 -msgid "Package(s) to reinstall" -msgstr "" -+#: ../cli.py:1114 ++#: ../cli.py:1117 +#, python-format +msgid "%d package to reinstall" +msgid_plural "%d packages to reinstall" +msgstr[0] "" -#: ../cli.py:960 -+#: ../cli.py:1136 ++#: ../cli.py:1139 msgid "No Packages Provided" msgstr "" -#: ../cli.py:1058 -+#: ../cli.py:1149 ++#: ../cli.py:1152 +msgid "Package(s) to install" +msgstr "" + -+#: ../cli.py:1256 ++#: ../cli.py:1259 #, python-format msgid "N/S Matched: %s" msgstr "" -#: ../cli.py:1075 -+#: ../cli.py:1273 ++#: ../cli.py:1276 #, python-format msgid " Name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1077 -+#: ../cli.py:1275 ++#: ../cli.py:1278 #, python-format msgid "" " Full name and summary matches %sonly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1095 -+#: ../cli.py:1293 ++#: ../cli.py:1296 #, python-format msgid "Matched: %s" msgstr "" -#: ../cli.py:1102 -+#: ../cli.py:1300 ++#: ../cli.py:1303 #, python-format msgid " Name and summary matches %smostly%s, use \"search all\" for everything." msgstr "" -#: ../cli.py:1106 -+#: ../cli.py:1304 ++#: ../cli.py:1307 #, python-format msgid "Warning: No matches found for: %s" msgstr "" -#: ../cli.py:1109 -+#: ../cli.py:1307 ++#: ../cli.py:1310 msgid "No Matches found" msgstr "" -#: ../cli.py:1174 -+#: ../cli.py:1411 ++#: ../cli.py:1414 #, python-format msgid "No Package Found for %s" msgstr "" -#: ../cli.py:1184 -+#: ../cli.py:1450 ++#: ../cli.py:1453 msgid "Cleaning repos: " msgstr "" -#: ../cli.py:1189 -+#: ../cli.py:1455 ++#: ../cli.py:1458 msgid "Cleaning up Everything" msgstr "" -#: ../cli.py:1205 -+#: ../cli.py:1471 ++#: ../cli.py:1474 msgid "Cleaning up Headers" msgstr "" -#: ../cli.py:1208 -+#: ../cli.py:1474 ++#: ../cli.py:1477 msgid "Cleaning up Packages" msgstr "" -#: ../cli.py:1211 -+#: ../cli.py:1477 ++#: ../cli.py:1480 msgid "Cleaning up xml metadata" msgstr "" -#: ../cli.py:1214 -+#: ../cli.py:1480 ++#: ../cli.py:1483 msgid "Cleaning up database cache" msgstr "" -#: ../cli.py:1217 -+#: ../cli.py:1483 ++#: ../cli.py:1486 msgid "Cleaning up expire-cache metadata" msgstr "" -#: ../cli.py:1220 -+#: ../cli.py:1486 ++#: ../cli.py:1489 msgid "Cleaning up cached rpmdb data" msgstr "" -#: ../cli.py:1223 -+#: ../cli.py:1489 ++#: ../cli.py:1492 msgid "Cleaning up plugins" msgstr "" -#: ../cli.py:1247 -+#: ../cli.py:1525 ++#: ../cli.py:1528 #, python-format msgid "Warning: No groups match: %s" msgstr "" -#: ../cli.py:1264 -+#: ../cli.py:1542 ../cli.py:1600 ++#: ../cli.py:1545 ../cli.py:1603 msgid "Installed Groups:" msgstr "" -#: ../cli.py:1270 -+#: ../cli.py:1548 ../cli.py:1606 ++#: ../cli.py:1551 ../cli.py:1609 msgid "Installed Language Groups:" msgstr "" -#: ../cli.py:1276 -+#: ../cli.py:1554 ../cli.py:1612 ++#: ../cli.py:1557 ../cli.py:1615 msgid "Available Groups:" msgstr "" -#: ../cli.py:1282 -+#: ../cli.py:1560 ../cli.py:1618 ++#: ../cli.py:1563 ../cli.py:1621 msgid "Available Language Groups:" msgstr "" -#: ../cli.py:1285 -+#: ../cli.py:1563 ../cli.py:1620 ++#: ../cli.py:1566 ../cli.py:1623 msgid "Done" msgstr "" -#: ../cli.py:1296 ../cli.py:1314 ../cli.py:1320 ../yum/__init__.py:3313 -+#: ../cli.py:1643 ../cli.py:1671 ../cli.py:1677 ../yum/__init__.py:3689 ++#: ../cli.py:1646 ../cli.py:1674 ../cli.py:1680 ../yum/__init__.py:3716 #, python-format msgid "Warning: Group %s does not exist." msgstr "" -#: ../cli.py:1324 -+#: ../cli.py:1681 ++#: ../cli.py:1684 msgid "No packages in any requested group available to install or update" msgstr "" -#: ../cli.py:1326 -+#: ../cli.py:1683 ++#: ../cli.py:1686 #, python-format -msgid "%d Package(s) to Install" -msgstr "" @@ -141294,18 +144512,18 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../cli.py:1336 ../yum/__init__.py:3325 -+#: ../cli.py:1703 ../yum/__init__.py:3701 ++#: ../cli.py:1706 ../yum/__init__.py:3728 #, python-format msgid "No group named %s exists" msgstr "" -#: ../cli.py:1342 -+#: ../cli.py:1709 ++#: ../cli.py:1712 msgid "No packages to remove from groups" msgstr "" -#: ../cli.py:1344 -+#: ../cli.py:1711 ++#: ../cli.py:1714 #, python-format -msgid "%d Package(s) to remove" -msgstr "" @@ -141314,37 +144532,37 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../cli.py:1386 -+#: ../cli.py:1752 ++#: ../cli.py:1755 #, python-format msgid "Package %s is already installed, skipping" msgstr "" -#: ../cli.py:1397 -+#: ../cli.py:1763 ++#: ../cli.py:1766 #, python-format msgid "Discarding non-comparable pkg %s.%s" msgstr "" #. we've not got any installed that match n or n+a -#: ../cli.py:1423 -+#: ../cli.py:1789 ++#: ../cli.py:1792 #, python-format msgid "No other %s installed, adding to list for potential install" msgstr "" -#: ../cli.py:1443 -+#: ../cli.py:1809 ++#: ../cli.py:1812 msgid "Plugin Options" msgstr "" -#: ../cli.py:1451 -+#: ../cli.py:1821 ++#: ../cli.py:1824 #, python-format msgid "Command line error: %s" msgstr "" -#: ../cli.py:1467 -+#: ../cli.py:1843 ++#: ../cli.py:1846 #, python-format msgid "" "\n" @@ -141353,353 +144571,353 @@ index 704a726..c970fec 100644 msgstr "" -#: ../cli.py:1521 -+#: ../cli.py:1907 ++#: ../cli.py:1910 msgid "--color takes one of: auto, always, never" msgstr "" #. We have a relative installroot ... haha -#: ../cli.py:1596 -+#: ../cli.py:1982 ++#: ../cli.py:1985 #, python-format msgid "--installroot must be an absolute path: %s" msgstr "" -#: ../cli.py:1642 -+#: ../cli.py:2036 ++#: ../cli.py:2039 msgid "show this help message and exit" msgstr "" -#: ../cli.py:1646 -+#: ../cli.py:2040 ++#: ../cli.py:2043 msgid "be tolerant of errors" msgstr "" -#: ../cli.py:1649 -+#: ../cli.py:2043 ++#: ../cli.py:2046 msgid "run entirely from system cache, don't update cache" msgstr "" -#: ../cli.py:1652 -+#: ../cli.py:2046 ++#: ../cli.py:2049 msgid "config file location" msgstr "" -#: ../cli.py:1655 -+#: ../cli.py:2049 ++#: ../cli.py:2052 msgid "maximum command wait time" msgstr "" -#: ../cli.py:1657 -+#: ../cli.py:2051 ++#: ../cli.py:2054 msgid "debugging output level" msgstr "" -#: ../cli.py:1661 -+#: ../cli.py:2055 ++#: ../cli.py:2058 msgid "show duplicates, in repos, in list/search commands" msgstr "" -#: ../cli.py:1663 -+#: ../cli.py:2057 ++#: ../cli.py:2060 msgid "error output level" msgstr "" -#: ../cli.py:1666 -+#: ../cli.py:2060 ++#: ../cli.py:2063 msgid "debugging output level for rpm" msgstr "" -#: ../cli.py:1669 -+#: ../cli.py:2063 ++#: ../cli.py:2066 msgid "quiet operation" msgstr "" -#: ../cli.py:1671 -+#: ../cli.py:2065 ++#: ../cli.py:2068 msgid "verbose operation" msgstr "" -#: ../cli.py:1673 -+#: ../cli.py:2067 ++#: ../cli.py:2070 msgid "answer yes for all questions" msgstr "" -#: ../cli.py:1675 -+#: ../cli.py:2069 ++#: ../cli.py:2072 +msgid "answer no for all questions" +msgstr "" + -+#: ../cli.py:2073 ++#: ../cli.py:2076 msgid "show Yum version and exit" msgstr "" -#: ../cli.py:1676 -+#: ../cli.py:2074 ++#: ../cli.py:2077 msgid "set install root" msgstr "" -#: ../cli.py:1680 -+#: ../cli.py:2078 ++#: ../cli.py:2081 msgid "enable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1684 -+#: ../cli.py:2082 ++#: ../cli.py:2085 msgid "disable one or more repositories (wildcards allowed)" msgstr "" -#: ../cli.py:1687 -+#: ../cli.py:2085 ++#: ../cli.py:2088 msgid "exclude package(s) by name or glob" msgstr "" -#: ../cli.py:1689 -+#: ../cli.py:2087 ++#: ../cli.py:2090 msgid "disable exclude from main, for a repo or for everything" msgstr "" -#: ../cli.py:1692 -+#: ../cli.py:2090 ++#: ../cli.py:2093 msgid "enable obsoletes processing during updates" msgstr "" -#: ../cli.py:1694 -+#: ../cli.py:2092 ++#: ../cli.py:2095 msgid "disable Yum plugins" msgstr "" -#: ../cli.py:1696 -+#: ../cli.py:2094 ++#: ../cli.py:2097 msgid "disable gpg signature checking" msgstr "" -#: ../cli.py:1698 -+#: ../cli.py:2096 ++#: ../cli.py:2099 msgid "disable plugins by name" msgstr "" -#: ../cli.py:1701 -+#: ../cli.py:2099 ++#: ../cli.py:2102 msgid "enable plugins by name" msgstr "" -#: ../cli.py:1704 -+#: ../cli.py:2102 ++#: ../cli.py:2105 msgid "skip packages with depsolving problems" msgstr "" -#: ../cli.py:1706 -+#: ../cli.py:2104 ++#: ../cli.py:2107 msgid "control whether color is used" msgstr "" -#: ../cli.py:1708 -+#: ../cli.py:2106 ++#: ../cli.py:2109 msgid "set value of $releasever in yum config and repo files" msgstr "" -#: ../cli.py:1710 -+#: ../cli.py:2108 ++#: ../cli.py:2111 msgid "set arbitrary config and repo options" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jan" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Feb" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Mar" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Apr" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "May" msgstr "" -#: ../output.py:307 -+#: ../output.py:440 ++#: ../output.py:453 msgid "Jun" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Jul" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Aug" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Sep" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Oct" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Nov" msgstr "" -#: ../output.py:308 -+#: ../output.py:441 ++#: ../output.py:454 msgid "Dec" msgstr "" -#: ../output.py:318 -+#: ../output.py:455 ++#: ../output.py:468 msgid "Trying other mirror." msgstr "" -#: ../output.py:581 -+#: ../output.py:798 ++#: ../output.py:811 #, python-format msgid "Name : %s%s%s" msgstr "" -#: ../output.py:582 -+#: ../output.py:799 ++#: ../output.py:812 #, python-format msgid "Arch : %s" msgstr "" -#: ../output.py:584 -+#: ../output.py:801 ++#: ../output.py:814 #, python-format msgid "Epoch : %s" msgstr "" -#: ../output.py:585 -+#: ../output.py:802 ++#: ../output.py:815 #, python-format msgid "Version : %s" msgstr "" -#: ../output.py:586 -+#: ../output.py:803 ++#: ../output.py:816 #, python-format msgid "Release : %s" msgstr "" -#: ../output.py:587 -+#: ../output.py:804 ++#: ../output.py:817 #, python-format msgid "Size : %s" msgstr "" -#: ../output.py:588 ../output.py:900 -+#: ../output.py:805 ../output.py:1198 ++#: ../output.py:818 ../output.py:1211 #, python-format msgid "Repo : %s" msgstr "" -#: ../output.py:590 -+#: ../output.py:807 ++#: ../output.py:820 #, python-format msgid "From repo : %s" msgstr "" -#: ../output.py:592 -+#: ../output.py:809 ++#: ../output.py:822 #, python-format msgid "Committer : %s" msgstr "" -#: ../output.py:593 -+#: ../output.py:810 ++#: ../output.py:823 #, python-format msgid "Committime : %s" msgstr "" -#: ../output.py:594 -+#: ../output.py:811 ++#: ../output.py:824 #, python-format msgid "Buildtime : %s" msgstr "" -#: ../output.py:596 -+#: ../output.py:813 ++#: ../output.py:826 #, python-format msgid "Install time: %s" msgstr "" -#: ../output.py:604 -+#: ../output.py:821 ++#: ../output.py:834 #, python-format msgid "Installed by: %s" msgstr "" -#: ../output.py:611 -+#: ../output.py:828 ++#: ../output.py:841 #, python-format msgid "Changed by : %s" msgstr "" -#: ../output.py:612 -+#: ../output.py:829 ++#: ../output.py:842 msgid "Summary : " msgstr "" -#: ../output.py:614 ../output.py:913 -+#: ../output.py:831 ../output.py:1214 ++#: ../output.py:844 ../output.py:1227 #, python-format msgid "URL : %s" msgstr "" -#: ../output.py:615 -+#: ../output.py:832 ++#: ../output.py:845 msgid "License : " msgstr "" -#: ../output.py:616 ../output.py:910 -+#: ../output.py:833 ../output.py:1211 ++#: ../output.py:846 ../output.py:1224 msgid "Description : " msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "y" msgstr "" -#: ../output.py:684 -+#: ../output.py:949 ++#: ../output.py:962 msgid "yes" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "n" msgstr "" -#: ../output.py:685 -+#: ../output.py:950 ++#: ../output.py:963 msgid "no" msgstr "" -#: ../output.py:689 -+#: ../output.py:954 ++#: ../output.py:967 msgid "Is this ok [y/N]: " msgstr "" -#: ../output.py:777 -+#: ../output.py:1046 ++#: ../output.py:1059 #, python-format msgid "" "\n" @@ -141707,190 +144925,190 @@ index 704a726..c970fec 100644 msgstr "" -#: ../output.py:781 -+#: ../output.py:1050 ++#: ../output.py:1063 #, python-format msgid " Group-Id: %s" msgstr "" -#: ../output.py:786 -+#: ../output.py:1055 ++#: ../output.py:1068 #, python-format msgid " Description: %s" msgstr "" -#: ../output.py:788 -+#: ../output.py:1057 ++#: ../output.py:1070 #, python-format msgid " Language: %s" msgstr "" -#: ../output.py:790 -+#: ../output.py:1059 ++#: ../output.py:1072 msgid " Mandatory Packages:" msgstr "" -#: ../output.py:791 -+#: ../output.py:1060 ++#: ../output.py:1073 msgid " Default Packages:" msgstr "" -#: ../output.py:792 -+#: ../output.py:1061 ++#: ../output.py:1074 msgid " Optional Packages:" msgstr "" -#: ../output.py:793 -+#: ../output.py:1062 ++#: ../output.py:1075 msgid " Conditional Packages:" msgstr "" -#: ../output.py:814 -+#: ../output.py:1086 ++#: ../output.py:1099 #, python-format msgid "package: %s" msgstr "" -#: ../output.py:816 -+#: ../output.py:1088 ++#: ../output.py:1101 msgid " No dependencies for this package" msgstr "" -#: ../output.py:821 -+#: ../output.py:1093 ++#: ../output.py:1106 #, python-format msgid " dependency: %s" msgstr "" -#: ../output.py:823 -+#: ../output.py:1095 ++#: ../output.py:1108 msgid " Unsatisfied dependency" msgstr "" -#: ../output.py:901 -+#: ../output.py:1206 ++#: ../output.py:1219 msgid "Matched from:" msgstr "" -#: ../output.py:916 -+#: ../output.py:1217 ++#: ../output.py:1230 #, python-format msgid "License : %s" msgstr "" -#: ../output.py:919 -+#: ../output.py:1220 ++#: ../output.py:1233 #, python-format msgid "Filename : %s" msgstr "" -#: ../output.py:923 -+#: ../output.py:1224 ++#: ../output.py:1237 msgid "Other : " msgstr "" -#: ../output.py:966 -+#: ../output.py:1280 ++#: ../output.py:1293 msgid "There was an error calculating total download size" msgstr "" -#: ../output.py:971 -+#: ../output.py:1285 ++#: ../output.py:1298 #, python-format msgid "Total size: %s" msgstr "" -#: ../output.py:974 -+#: ../output.py:1288 ++#: ../output.py:1301 #, python-format msgid "Total download size: %s" msgstr "" -#: ../output.py:978 ../output.py:998 -+#: ../output.py:1292 ../output.py:1315 ++#: ../output.py:1305 ../output.py:1328 #, python-format msgid "Installed size: %s" msgstr "" -#: ../output.py:994 -+#: ../output.py:1311 ++#: ../output.py:1324 msgid "There was an error calculating installed size" msgstr "" -#: ../output.py:1039 -+#: ../output.py:1357 ++#: ../output.py:1369 msgid "Reinstalling" msgstr "" -#: ../output.py:1040 -+#: ../output.py:1358 ++#: ../output.py:1370 msgid "Downgrading" msgstr "" -#: ../output.py:1041 -+#: ../output.py:1359 ++#: ../output.py:1371 msgid "Installing for dependencies" msgstr "" -#: ../output.py:1042 -+#: ../output.py:1360 ++#: ../output.py:1372 msgid "Updating for dependencies" msgstr "" -#: ../output.py:1043 -+#: ../output.py:1361 ++#: ../output.py:1373 msgid "Removing for dependencies" msgstr "" -#: ../output.py:1050 ../output.py:1171 -+#: ../output.py:1368 ../output.py:1429 ../output.py:1530 ++#: ../output.py:1380 ../output.py:1441 ../output.py:1537 msgid "Skipped (dependency problems)" msgstr "" -#: ../output.py:1052 ../output.py:1687 -+#: ../output.py:1370 ../output.py:1430 ../output.py:2076 ++#: ../output.py:1382 ../output.py:1442 ../output.py:2083 msgid "Not installed" msgstr "" -#: ../output.py:1053 -+#: ../output.py:1371 ../output.py:1431 ++#: ../output.py:1383 ../output.py:1443 msgid "Not available" msgstr "" -#: ../output.py:1075 ../output.py:2024 -+#: ../output.py:1393 ../output.py:1441 ../output.py:1462 ../output.py:2435 ++#: ../output.py:1405 ../output.py:1453 ../output.py:1469 ../output.py:2441 msgid "Package" -msgstr "" +msgid_plural "Packages" +msgstr[0] "" -#: ../output.py:1075 -+#: ../output.py:1393 ++#: ../output.py:1405 msgid "Arch" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Version" msgstr "" -#: ../output.py:1076 -+#: ../output.py:1394 ++#: ../output.py:1406 msgid "Repository" msgstr "" -#: ../output.py:1077 -+#: ../output.py:1395 ++#: ../output.py:1407 msgid "Size" msgstr "" -#: ../output.py:1089 -+#: ../output.py:1407 ++#: ../output.py:1419 #, python-format msgid " replacing %s%s%s.%s %s\n" msgstr "" -#: ../output.py:1098 -+#: ../output.py:1416 ++#: ../output.py:1428 #, python-format msgid "" "\n" @@ -141901,76 +145119,76 @@ index 704a726..c970fec 100644 -#: ../output.py:1109 -#, python-format -msgid "Install %5.5s Package(s)\n" -+#: ../output.py:1421 ../output.py:2230 ../output.py:2231 ++#: ../output.py:1433 ../output.py:2236 ../output.py:2237 +msgid "Install" msgstr "" -#: ../output.py:1113 -#, python-format -msgid "Upgrade %5.5s Package(s)\n" -+#: ../output.py:1423 ++#: ../output.py:1435 +msgid "Upgrade" msgstr "" -#: ../output.py:1117 -#, python-format -msgid "Remove %5.5s Package(s)\n" -+#: ../output.py:1425 ++#: ../output.py:1437 +msgid "Remove" msgstr "" -#: ../output.py:1121 -#, python-format -msgid "Reinstall %5.5s Package(s)\n" -+#: ../output.py:1427 ../output.py:2236 ++#: ../output.py:1439 ../output.py:2242 +msgid "Reinstall" msgstr "" -#: ../output.py:1125 -#, python-format -msgid "Downgrade %5.5s Package(s)\n" -+#: ../output.py:1428 ../output.py:2237 ++#: ../output.py:1440 ../output.py:2243 +msgid "Downgrade" msgstr "" -#: ../output.py:1165 -+#: ../output.py:1464 ++#: ../output.py:1471 +msgid "Dependent package" +msgid_plural "Dependent packages" +msgstr[0] "" + -+#: ../output.py:1524 ++#: ../output.py:1531 msgid "Removed" msgstr "" -#: ../output.py:1166 -+#: ../output.py:1525 ++#: ../output.py:1532 msgid "Dependency Removed" msgstr "" -#: ../output.py:1168 -+#: ../output.py:1527 ++#: ../output.py:1534 msgid "Dependency Installed" msgstr "" -#: ../output.py:1170 -+#: ../output.py:1529 ++#: ../output.py:1536 msgid "Dependency Updated" msgstr "" -#: ../output.py:1172 -+#: ../output.py:1531 ++#: ../output.py:1538 msgid "Replaced" msgstr "" -#: ../output.py:1173 -+#: ../output.py:1532 ++#: ../output.py:1539 msgid "Failed" msgstr "" #. Delta between C-c's so we treat as exit -#: ../output.py:1260 -+#: ../output.py:1619 ++#: ../output.py:1626 msgid "two" msgstr "" @@ -141979,271 +145197,271 @@ index 704a726..c970fec 100644 #. to exit. #. Where "interupt (ctrl-c) again" and "two" are highlighted. -#: ../output.py:1271 -+#: ../output.py:1630 ++#: ../output.py:1637 #, python-format msgid "" "\n" -@@ -935,484 +957,536 @@ msgid "" +@@ -935,484 +957,542 @@ msgid "" "to exit.\n" msgstr "" -#: ../output.py:1282 -+#: ../output.py:1641 ++#: ../output.py:1648 msgid "user interrupt" msgstr "" -#: ../output.py:1300 -+#: ../output.py:1667 ++#: ../output.py:1674 msgid "Total" msgstr "" -#: ../output.py:1322 -+#: ../output.py:1689 ++#: ../output.py:1696 msgid "I" msgstr "" -#: ../output.py:1323 -+#: ../output.py:1690 ++#: ../output.py:1697 msgid "O" msgstr "" -#: ../output.py:1324 -+#: ../output.py:1691 ++#: ../output.py:1698 msgid "E" msgstr "" -#: ../output.py:1325 -+#: ../output.py:1692 ++#: ../output.py:1699 msgid "R" msgstr "" -#: ../output.py:1326 -+#: ../output.py:1693 ++#: ../output.py:1700 msgid "D" msgstr "" -#: ../output.py:1327 -+#: ../output.py:1694 ++#: ../output.py:1701 msgid "U" msgstr "" -#: ../output.py:1341 -+#: ../output.py:1708 ++#: ../output.py:1715 msgid "" msgstr "" -#: ../output.py:1342 -+#: ../output.py:1709 ++#: ../output.py:1716 msgid "System" msgstr "" -#: ../output.py:1411 -+#: ../output.py:1778 ++#: ../output.py:1785 #, python-format msgid "Skipping merged transaction %d to %d, as it overlaps" msgstr "" -#: ../output.py:1421 ../output.py:1592 -+#: ../output.py:1788 ../output.py:1978 ++#: ../output.py:1795 ../output.py:1985 msgid "No transactions" msgstr "" -#: ../output.py:1446 ../output.py:2013 -+#: ../output.py:1813 ../output.py:2424 ../output.py:2514 ++#: ../output.py:1820 ../output.py:2430 ../output.py:2520 msgid "Bad transaction IDs, or package(s), given" msgstr "" -#: ../output.py:1484 -+#: ../output.py:1860 ++#: ../output.py:1867 msgid "Command line" msgstr "" -#: ../output.py:1486 ../output.py:1908 -+#: ../output.py:1862 ../output.py:2312 ++#: ../output.py:1869 ../output.py:2318 msgid "Login user" msgstr "" #. REALLY Needs to use columns! -#: ../output.py:1487 ../output.py:2022 -+#: ../output.py:1863 ../output.py:2433 ++#: ../output.py:1870 ../output.py:2439 msgid "ID" msgstr "" -#: ../output.py:1489 -+#: ../output.py:1865 ++#: ../output.py:1872 msgid "Date and time" msgstr "" -#: ../output.py:1490 ../output.py:1910 ../output.py:2023 -+#: ../output.py:1866 ../output.py:2314 ../output.py:2434 ++#: ../output.py:1873 ../output.py:2320 ../output.py:2440 msgid "Action(s)" msgstr "" -#: ../output.py:1491 ../output.py:1911 -+#: ../output.py:1867 ../output.py:2315 ++#: ../output.py:1874 ../output.py:2321 msgid "Altered" msgstr "" -#: ../output.py:1538 -+#: ../output.py:1914 ++#: ../output.py:1921 msgid "No transaction ID given" msgstr "" -#: ../output.py:1564 ../output.py:1972 -+#: ../output.py:1940 ../output.py:2380 ++#: ../output.py:1947 ../output.py:2386 msgid "Bad transaction ID given" msgstr "" -#: ../output.py:1569 -+#: ../output.py:1945 ++#: ../output.py:1952 msgid "Not found given transaction ID" msgstr "" -#: ../output.py:1577 -+#: ../output.py:1953 ++#: ../output.py:1960 msgid "Found more than one transaction ID!" msgstr "" -#: ../output.py:1618 ../output.py:1980 -+#: ../output.py:2004 ../output.py:2388 ++#: ../output.py:2011 ../output.py:2394 msgid "No transaction ID, or package, given" msgstr "" -#: ../output.py:1686 ../output.py:1845 -+#: ../output.py:2075 ../output.py:2238 ++#: ../output.py:2082 ../output.py:2244 msgid "Downgraded" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Older" msgstr "" -#: ../output.py:1688 -+#: ../output.py:2077 ++#: ../output.py:2084 msgid "Newer" msgstr "" -#: ../output.py:1724 ../output.py:1726 -+#: ../output.py:2115 ../output.py:2117 ../output.py:2536 ++#: ../output.py:2121 ../output.py:2123 ../output.py:2542 msgid "Transaction ID :" msgstr "" -#: ../output.py:1728 -+#: ../output.py:2119 ../output.py:2538 ++#: ../output.py:2125 ../output.py:2544 msgid "Begin time :" msgstr "" -#: ../output.py:1731 ../output.py:1733 -+#: ../output.py:2122 ../output.py:2124 ++#: ../output.py:2128 ../output.py:2130 msgid "Begin rpmdb :" msgstr "" -#: ../output.py:1749 -+#: ../output.py:2140 ++#: ../output.py:2146 #, python-format msgid "(%u seconds)" msgstr "" -#: ../output.py:1751 -+#: ../output.py:2142 ++#: ../output.py:2148 #, python-format msgid "(%u minutes)" msgstr "" -#: ../output.py:1753 -+#: ../output.py:2144 ++#: ../output.py:2150 #, python-format msgid "(%u hours)" msgstr "" -#: ../output.py:1755 -+#: ../output.py:2146 ++#: ../output.py:2152 #, python-format msgid "(%u days)" msgstr "" -#: ../output.py:1756 -+#: ../output.py:2147 ++#: ../output.py:2153 msgid "End time :" msgstr "" -#: ../output.py:1759 ../output.py:1761 -+#: ../output.py:2150 ../output.py:2152 ++#: ../output.py:2156 ../output.py:2158 msgid "End rpmdb :" msgstr "" -#: ../output.py:1764 ../output.py:1766 -+#: ../output.py:2155 ../output.py:2157 ++#: ../output.py:2161 ../output.py:2163 msgid "User :" msgstr "" -#: ../output.py:1770 ../output.py:1773 ../output.py:1775 ../output.py:1777 -#: ../output.py:1779 -+#: ../output.py:2161 ../output.py:2164 ../output.py:2166 ../output.py:2168 -+#: ../output.py:2170 ++#: ../output.py:2167 ../output.py:2170 ../output.py:2172 ../output.py:2174 ++#: ../output.py:2176 msgid "Return-Code :" msgstr "" -#: ../output.py:1770 ../output.py:1775 -+#: ../output.py:2161 ../output.py:2166 ++#: ../output.py:2167 ../output.py:2172 msgid "Aborted" msgstr "" -#: ../output.py:1773 -+#: ../output.py:2164 ++#: ../output.py:2170 msgid "Failures:" msgstr "" -#: ../output.py:1777 -+#: ../output.py:2168 ++#: ../output.py:2174 msgid "Failure:" msgstr "" -#: ../output.py:1779 -+#: ../output.py:2170 ++#: ../output.py:2176 msgid "Success" msgstr "" -#: ../output.py:1784 ../output.py:1786 -+#: ../output.py:2175 ../output.py:2177 ../output.py:2567 ++#: ../output.py:2181 ../output.py:2183 ../output.py:2573 msgid "Command Line :" msgstr "" -#: ../output.py:1795 -+#: ../output.py:2186 ++#: ../output.py:2192 #, python-format msgid "Additional non-default information stored: %d" msgstr "" #. This is _possible_, but not common -#: ../output.py:1800 -+#: ../output.py:2191 ++#: ../output.py:2197 msgid "Transaction performed with:" msgstr "" -#: ../output.py:1804 -+#: ../output.py:2195 ++#: ../output.py:2201 msgid "Packages Altered:" msgstr "" -#: ../output.py:1808 -+#: ../output.py:2199 ++#: ../output.py:2205 msgid "Packages Skipped:" msgstr "" -#: ../output.py:1814 -+#: ../output.py:2207 ++#: ../output.py:2213 msgid "Rpmdb Problems:" msgstr "" -#: ../output.py:1825 -+#: ../output.py:2218 ++#: ../output.py:2224 msgid "Scriptlet output:" msgstr "" -#: ../output.py:1831 -+#: ../output.py:2224 ++#: ../output.py:2230 msgid "Errors:" msgstr "" @@ -142252,17 +145470,17 @@ index 704a726..c970fec 100644 -msgstr "" - -#: ../output.py:1839 -+#: ../output.py:2232 ++#: ../output.py:2238 msgid "Dep-Install" msgstr "" -#: ../output.py:1841 -+#: ../output.py:2234 ++#: ../output.py:2240 msgid "Obsoleting" msgstr "" -#: ../output.py:1842 -+#: ../output.py:2235 ++#: ../output.py:2241 msgid "Erase" msgstr "" @@ -142275,224 +145493,224 @@ index 704a726..c970fec 100644 -msgstr "" - -#: ../output.py:1846 -+#: ../output.py:2239 ++#: ../output.py:2245 msgid "Update" msgstr "" -#: ../output.py:1909 -+#: ../output.py:2313 ++#: ../output.py:2319 msgid "Time" msgstr "" -#: ../output.py:1935 -+#: ../output.py:2339 ++#: ../output.py:2345 msgid "Last day" msgstr "" -#: ../output.py:1936 -+#: ../output.py:2340 ++#: ../output.py:2346 msgid "Last week" msgstr "" -#: ../output.py:1937 -+#: ../output.py:2341 ++#: ../output.py:2347 msgid "Last 2 weeks" msgstr "" #. US default :p -#: ../output.py:1938 -+#: ../output.py:2342 ++#: ../output.py:2348 msgid "Last 3 months" msgstr "" -#: ../output.py:1939 -+#: ../output.py:2343 ++#: ../output.py:2349 msgid "Last 6 months" msgstr "" -#: ../output.py:1940 -+#: ../output.py:2344 ++#: ../output.py:2350 msgid "Last year" msgstr "" -#: ../output.py:1941 -+#: ../output.py:2345 ++#: ../output.py:2351 msgid "Over a year ago" msgstr "" -#: ../output.py:1984 -+#: ../output.py:2392 ++#: ../output.py:2398 #, python-format msgid "No Transaction %s found" msgstr "" -#: ../output.py:1990 -+#: ../output.py:2398 ++#: ../output.py:2404 msgid "Transaction ID:" msgstr "" -#: ../output.py:1991 -+#: ../output.py:2399 ++#: ../output.py:2405 msgid "Available additional history information:" msgstr "" -#: ../output.py:2003 -+#: ../output.py:2412 ++#: ../output.py:2418 #, python-format msgid "%s: No additional data found by this name" msgstr "" -#: ../output.py:2106 -+#: ../output.py:2539 ++#: ../output.py:2545 +msgid "Package :" +msgstr "" + -+#: ../output.py:2540 ++#: ../output.py:2546 +msgid "State :" +msgstr "" + -+#: ../output.py:2543 ++#: ../output.py:2549 +msgid "Size :" +msgstr "" + -+#: ../output.py:2545 ++#: ../output.py:2551 +msgid "Build host :" +msgstr "" + -+#: ../output.py:2548 ++#: ../output.py:2554 +msgid "Build time :" +msgstr "" + -+#: ../output.py:2550 ++#: ../output.py:2556 +msgid "Packager :" +msgstr "" + -+#: ../output.py:2552 ++#: ../output.py:2558 +msgid "Vendor :" +msgstr "" + -+#: ../output.py:2554 ++#: ../output.py:2560 +msgid "License :" +msgstr "" + -+#: ../output.py:2556 ++#: ../output.py:2562 +msgid "URL :" +msgstr "" + -+#: ../output.py:2558 ++#: ../output.py:2564 +msgid "Source RPM :" +msgstr "" + -+#: ../output.py:2561 ++#: ../output.py:2567 +msgid "Commit Time :" +msgstr "" + -+#: ../output.py:2563 ++#: ../output.py:2569 +msgid "Committer :" +msgstr "" + -+#: ../output.py:2565 ++#: ../output.py:2571 +msgid "Reason :" +msgstr "" + -+#: ../output.py:2569 ++#: ../output.py:2575 +msgid "From repo :" +msgstr "" + -+#: ../output.py:2573 ++#: ../output.py:2579 +msgid "Installed by :" +msgstr "" + -+#: ../output.py:2577 ++#: ../output.py:2583 +msgid "Changed by :" +msgstr "" + -+#: ../output.py:2622 ++#: ../output.py:2628 msgid "installed" msgstr "" -#: ../output.py:2107 -+#: ../output.py:2623 ++#: ../output.py:2629 msgid "an update" msgstr "" -#: ../output.py:2108 -+#: ../output.py:2624 ++#: ../output.py:2630 msgid "erased" msgstr "" -#: ../output.py:2109 -+#: ../output.py:2625 ++#: ../output.py:2631 msgid "reinstalled" msgstr "" -#: ../output.py:2110 -+#: ../output.py:2626 ++#: ../output.py:2632 msgid "a downgrade" msgstr "" -#: ../output.py:2111 -+#: ../output.py:2627 ++#: ../output.py:2633 msgid "obsoleting" msgstr "" -#: ../output.py:2112 -+#: ../output.py:2628 ++#: ../output.py:2634 msgid "updated" msgstr "" -#: ../output.py:2113 -+#: ../output.py:2629 ++#: ../output.py:2635 msgid "obsoleted" msgstr "" -#: ../output.py:2117 -+#: ../output.py:2633 ++#: ../output.py:2639 #, python-format msgid "---> Package %s.%s %s:%s-%s will be %s" msgstr "" -#: ../output.py:2124 -+#: ../output.py:2644 ++#: ../output.py:2650 msgid "--> Running transaction check" msgstr "" -#: ../output.py:2129 -+#: ../output.py:2650 ++#: ../output.py:2656 msgid "--> Restarting Dependency Resolution with new changes." msgstr "" -#: ../output.py:2134 -+#: ../output.py:2656 ++#: ../output.py:2662 msgid "--> Finished Dependency Resolution" msgstr "" -#: ../output.py:2139 ../output.py:2144 -+#: ../output.py:2669 ../output.py:2682 ++#: ../output.py:2675 ../output.py:2688 #, python-format msgid "--> Processing Dependency: %s for package: %s" msgstr "" -#: ../output.py:2149 -+#: ../output.py:2695 ++#: ../output.py:2701 #, python-format msgid "---> Keeping package: %s" msgstr "" -#: ../output.py:2152 -+#: ../output.py:2704 ++#: ../output.py:2710 #, python-format msgid "--> Unresolved Dependency: %s" msgstr "" -#: ../output.py:2163 -+#: ../output.py:2721 ++#: ../output.py:2727 #, python-format msgid "Package: %s" msgstr "" -#: ../output.py:2165 -+#: ../output.py:2723 ++#: ../output.py:2729 #, python-format msgid "" "\n" @@ -142500,7 +145718,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../output.py:2174 -+#: ../output.py:2732 ++#: ../output.py:2738 #, python-format msgid "" "\n" @@ -142508,7 +145726,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../output.py:2179 -+#: ../output.py:2737 ++#: ../output.py:2743 #, python-format msgid "" "\n" @@ -142516,7 +145734,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../output.py:2181 -+#: ../output.py:2739 ++#: ../output.py:2745 msgid "" "\n" " Not found" @@ -142524,43 +145742,49 @@ index 704a726..c970fec 100644 #. These should be the only three things we care about: -#: ../output.py:2196 -+#: ../output.py:2754 ++#: ../output.py:2760 msgid "Updated By" msgstr "" -#: ../output.py:2197 -+#: ../output.py:2755 ++#: ../output.py:2761 msgid "Downgraded By" msgstr "" -#: ../output.py:2198 -+#: ../output.py:2756 ++#: ../output.py:2762 msgid "Obsoleted By" msgstr "" -#: ../output.py:2216 -+#: ../output.py:2774 ++#: ../output.py:2780 msgid "Available" msgstr "" -#: ../output.py:2243 ../output.py:2248 -+#: ../output.py:2809 ../output.py:2822 ++#: ../output.py:2815 ../output.py:2828 #, python-format msgid "--> Processing Conflict: %s conflicts %s" msgstr "" -#: ../output.py:2252 -+#: ../output.py:2828 ++#: ../output.py:2834 msgid "--> Populating transaction set with selected packages. Please wait." msgstr "" -#: ../output.py:2256 -+#: ../output.py:2837 ++#: ../output.py:2843 #, python-format msgid "---> Downloading header for %s to pack into transaction set." msgstr "" -#: ../utils.py:99 ++#. self.event(txmbr.name, count, len(base.tsInfo), count, ) ++#. (te_current*100L)/te_total ++#: ../output.py:3107 ++msgid "Verifying" ++msgstr "" ++ +#: ../utils.py:129 msgid "Running" msgstr "" @@ -142586,7 +145810,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../utils.py:104 ../yumcommands.py:994 -+#: ../utils.py:134 ../yumcommands.py:1796 ++#: ../utils.py:134 ../yumcommands.py:1803 msgid "Unknown" msgstr "" @@ -142640,7 +145864,7 @@ index 704a726..c970fec 100644 #, python-format msgid "" "\n" -@@ -1420,47 +1494,47 @@ msgid "" +@@ -1420,47 +1500,47 @@ msgid "" "%s" msgstr "" @@ -142697,7 +145921,7 @@ index 704a726..c970fec 100644 msgid "Complete!" msgstr "" -@@ -1472,7 +1546,7 @@ msgstr "" +@@ -1472,7 +1552,7 @@ msgstr "" msgid "You need to be root to perform this command." msgstr "" @@ -142706,7 +145930,7 @@ index 704a726..c970fec 100644 msgid "" "\n" "You have enabled checking of packages via GPG keys. This is a good thing. \n" -@@ -1489,451 +1563,480 @@ msgid "" +@@ -1489,451 +1569,480 @@ msgid "" "For more information contact your distribution or package provider.\n" msgstr "" @@ -142876,14 +146100,14 @@ index 704a726..c970fec 100644 - -#: ../yumcommands.py:441 -msgid "No Groups on which to run command" --msgstr "" -- --#: ../yumcommands.py:454 --msgid "List available package groups" +#: ../yumcommands.py:773 +msgid "Display, or use, the groups information" msgstr "" +-#: ../yumcommands.py:454 +-msgid "List available package groups" +-msgstr "" +- -#: ../yumcommands.py:474 -msgid "Install the packages in a group on your system" +#: ../yumcommands.py:776 @@ -143003,153 +146227,153 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yumcommands.py:893 ../yumcommands.py:894 -+#: ../yumcommands.py:1695 ../yumcommands.py:1696 ++#: ../yumcommands.py:1702 ../yumcommands.py:1703 msgid "enabled" msgstr "" -#: ../yumcommands.py:920 ../yumcommands.py:921 -+#: ../yumcommands.py:1722 ../yumcommands.py:1723 ++#: ../yumcommands.py:1729 ../yumcommands.py:1730 msgid "disabled" msgstr "" -#: ../yumcommands.py:937 -+#: ../yumcommands.py:1739 ++#: ../yumcommands.py:1746 msgid "Repo-id : " msgstr "" -#: ../yumcommands.py:938 -+#: ../yumcommands.py:1740 ++#: ../yumcommands.py:1747 msgid "Repo-name : " msgstr "" -#: ../yumcommands.py:941 -+#: ../yumcommands.py:1743 ++#: ../yumcommands.py:1750 msgid "Repo-status : " msgstr "" -#: ../yumcommands.py:944 -+#: ../yumcommands.py:1746 ++#: ../yumcommands.py:1753 msgid "Repo-revision: " msgstr "" -#: ../yumcommands.py:948 -+#: ../yumcommands.py:1750 ++#: ../yumcommands.py:1757 msgid "Repo-tags : " msgstr "" -#: ../yumcommands.py:954 -+#: ../yumcommands.py:1756 ++#: ../yumcommands.py:1763 msgid "Repo-distro-tags: " msgstr "" -#: ../yumcommands.py:959 -+#: ../yumcommands.py:1761 ++#: ../yumcommands.py:1768 msgid "Repo-updated : " msgstr "" -#: ../yumcommands.py:961 -+#: ../yumcommands.py:1763 ++#: ../yumcommands.py:1770 msgid "Repo-pkgs : " msgstr "" -#: ../yumcommands.py:962 -+#: ../yumcommands.py:1764 ++#: ../yumcommands.py:1771 msgid "Repo-size : " msgstr "" -#: ../yumcommands.py:969 ../yumcommands.py:990 -+#: ../yumcommands.py:1771 ../yumcommands.py:1792 ++#: ../yumcommands.py:1778 ../yumcommands.py:1799 msgid "Repo-baseurl : " msgstr "" -#: ../yumcommands.py:977 -+#: ../yumcommands.py:1779 ++#: ../yumcommands.py:1786 msgid "Repo-metalink: " msgstr "" -#: ../yumcommands.py:981 -+#: ../yumcommands.py:1783 ++#: ../yumcommands.py:1790 msgid " Updated : " msgstr "" -#: ../yumcommands.py:984 -+#: ../yumcommands.py:1786 ++#: ../yumcommands.py:1793 msgid "Repo-mirrors : " msgstr "" -#: ../yumcommands.py:1000 -+#: ../yumcommands.py:1802 ++#: ../yumcommands.py:1809 #, python-format msgid "Never (last: %s)" msgstr "" -#: ../yumcommands.py:1002 -+#: ../yumcommands.py:1804 ++#: ../yumcommands.py:1811 #, python-format msgid "Instant (last: %s)" msgstr "" -#: ../yumcommands.py:1005 -+#: ../yumcommands.py:1807 ++#: ../yumcommands.py:1814 #, python-format msgid "%s second(s) (last: %s)" msgstr "" -#: ../yumcommands.py:1007 -+#: ../yumcommands.py:1809 ++#: ../yumcommands.py:1816 msgid "Repo-expire : " msgstr "" -#: ../yumcommands.py:1010 -+#: ../yumcommands.py:1812 ++#: ../yumcommands.py:1819 msgid "Repo-exclude : " msgstr "" -#: ../yumcommands.py:1014 -+#: ../yumcommands.py:1816 ++#: ../yumcommands.py:1823 msgid "Repo-include : " msgstr "" -#: ../yumcommands.py:1018 -+#: ../yumcommands.py:1820 ++#: ../yumcommands.py:1827 msgid "Repo-excluded: " msgstr "" -#: ../yumcommands.py:1022 -+#: ../yumcommands.py:1824 ++#: ../yumcommands.py:1831 msgid "Repo-filename: " msgstr "" #. Work out the first (id) and last (enabled/disalbed/count), #. then chop the middle (name)... -#: ../yumcommands.py:1032 ../yumcommands.py:1061 -+#: ../yumcommands.py:1834 ../yumcommands.py:1863 ++#: ../yumcommands.py:1841 ../yumcommands.py:1870 msgid "repo id" msgstr "" -#: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068 -+#: ../yumcommands.py:1851 ../yumcommands.py:1852 ../yumcommands.py:1870 ++#: ../yumcommands.py:1858 ../yumcommands.py:1859 ../yumcommands.py:1877 msgid "status" msgstr "" -#: ../yumcommands.py:1062 -+#: ../yumcommands.py:1864 ++#: ../yumcommands.py:1871 msgid "repo name" msgstr "" -#: ../yumcommands.py:1099 -+#: ../yumcommands.py:1926 ++#: ../yumcommands.py:1933 msgid "Display a helpful usage message" msgstr "" -#: ../yumcommands.py:1133 -+#: ../yumcommands.py:1968 ++#: ../yumcommands.py:1975 #, python-format msgid "No help available for %s" msgstr "" -#: ../yumcommands.py:1138 -+#: ../yumcommands.py:1973 ++#: ../yumcommands.py:1980 msgid "" "\n" "\n" @@ -143157,7 +146381,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yumcommands.py:1140 -+#: ../yumcommands.py:1975 ++#: ../yumcommands.py:1982 msgid "" "\n" "\n" @@ -143165,148 +146389,148 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yumcommands.py:1168 -+#: ../yumcommands.py:2060 ++#: ../yumcommands.py:2067 msgid "Setting up Reinstall Process" msgstr "" -#: ../yumcommands.py:1176 -+#: ../yumcommands.py:2072 ++#: ../yumcommands.py:2079 msgid "reinstall a package" msgstr "" -#: ../yumcommands.py:1195 -+#: ../yumcommands.py:2135 ++#: ../yumcommands.py:2142 msgid "Setting up Downgrade Process" msgstr "" -#: ../yumcommands.py:1202 -+#: ../yumcommands.py:2146 ++#: ../yumcommands.py:2153 msgid "downgrade a package" msgstr "" -#: ../yumcommands.py:1216 -+#: ../yumcommands.py:2185 ++#: ../yumcommands.py:2192 msgid "Display a version for the machine and/or available repos." msgstr "" -#: ../yumcommands.py:1255 -+#: ../yumcommands.py:2237 ++#: ../yumcommands.py:2244 msgid " Yum version groups:" msgstr "" -#: ../yumcommands.py:1265 -+#: ../yumcommands.py:2247 ++#: ../yumcommands.py:2254 msgid " Group :" msgstr "" -#: ../yumcommands.py:1266 -+#: ../yumcommands.py:2248 ++#: ../yumcommands.py:2255 msgid " Packages:" msgstr "" -#: ../yumcommands.py:1295 -+#: ../yumcommands.py:2277 ++#: ../yumcommands.py:2284 msgid "Installed:" msgstr "" -#: ../yumcommands.py:1303 -+#: ../yumcommands.py:2285 ++#: ../yumcommands.py:2292 msgid "Group-Installed:" msgstr "" -#: ../yumcommands.py:1312 -+#: ../yumcommands.py:2294 ++#: ../yumcommands.py:2301 msgid "Available:" msgstr "" -#: ../yumcommands.py:1321 -+#: ../yumcommands.py:2303 ++#: ../yumcommands.py:2310 msgid "Group-Available:" msgstr "" -#: ../yumcommands.py:1360 -+#: ../yumcommands.py:2367 ++#: ../yumcommands.py:2374 msgid "Display, or use, the transaction history" msgstr "" -#: ../yumcommands.py:1432 -+#: ../yumcommands.py:2461 ++#: ../yumcommands.py:2468 +msgid "Transactions:" +msgstr "" + -+#: ../yumcommands.py:2462 ++#: ../yumcommands.py:2469 +msgid "Begin time :" +msgstr "" + -+#: ../yumcommands.py:2463 ++#: ../yumcommands.py:2470 +msgid "End time :" +msgstr "" + -+#: ../yumcommands.py:2464 ++#: ../yumcommands.py:2471 +msgid "Counts :" +msgstr "" + -+#: ../yumcommands.py:2465 ++#: ../yumcommands.py:2472 +msgid " NEVRAC :" +msgstr "" + -+#: ../yumcommands.py:2466 ++#: ../yumcommands.py:2473 +msgid " NEVRA :" +msgstr "" + -+#: ../yumcommands.py:2467 ++#: ../yumcommands.py:2474 +msgid " NA :" +msgstr "" + -+#: ../yumcommands.py:2468 ++#: ../yumcommands.py:2475 +msgid " NEVR :" +msgstr "" + -+#: ../yumcommands.py:2469 ++#: ../yumcommands.py:2476 +msgid " rpm DB :" +msgstr "" + -+#: ../yumcommands.py:2470 ++#: ../yumcommands.py:2477 +msgid " yum DB :" +msgstr "" + -+#: ../yumcommands.py:2503 ++#: ../yumcommands.py:2510 #, python-format msgid "Invalid history sub-command, use: %s." msgstr "" -#: ../yumcommands.py:1439 -+#: ../yumcommands.py:2510 ++#: ../yumcommands.py:2517 msgid "You don't have access to the history DB." msgstr "" -#: ../yumcommands.py:1487 -+#: ../yumcommands.py:2602 ++#: ../yumcommands.py:2609 msgid "Check for problems in the rpmdb" msgstr "" -#: ../yumcommands.py:1514 -+#: ../yumcommands.py:2667 ++#: ../yumcommands.py:2674 msgid "load a saved transaction from filename" msgstr "" -#: ../yumcommands.py:1518 -+#: ../yumcommands.py:2684 ++#: ../yumcommands.py:2691 msgid "No saved transaction file specified." msgstr "" -#: ../yumcommands.py:1522 -+#: ../yumcommands.py:2688 ++#: ../yumcommands.py:2695 #, python-format msgid "loading transaction from %s" msgstr "" -#: ../yumcommands.py:1528 -+#: ../yumcommands.py:2694 ++#: ../yumcommands.py:2701 #, python-format msgid "Transaction loaded from %s with %s members" msgstr "" -@@ -1944,100 +2047,106 @@ msgstr "" +@@ -1944,100 +2053,106 @@ msgstr "" msgid " Yum checks failed: %s" msgstr "" @@ -143351,226 +146575,226 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/depsolve.py:84 -+#: ../yum/depsolve.py:86 ++#: ../yum/depsolve.py:85 msgid "doTsSetup() will go away in a future version of Yum.\n" msgstr "" -#: ../yum/depsolve.py:99 -+#: ../yum/depsolve.py:101 ++#: ../yum/depsolve.py:100 msgid "Setting up TransactionSets before config class is up" msgstr "" -#: ../yum/depsolve.py:153 -+#: ../yum/depsolve.py:155 ++#: ../yum/depsolve.py:154 #, python-format msgid "Invalid tsflag in config file: %s" msgstr "" -#: ../yum/depsolve.py:164 -+#: ../yum/depsolve.py:173 ++#: ../yum/depsolve.py:172 #, python-format msgid "Searching pkgSack for dep: %s" msgstr "" -#: ../yum/depsolve.py:207 -+#: ../yum/depsolve.py:224 ++#: ../yum/depsolve.py:223 #, python-format msgid "Member: %s" msgstr "" -#: ../yum/depsolve.py:221 ../yum/depsolve.py:793 -+#: ../yum/depsolve.py:238 ../yum/depsolve.py:871 ++#: ../yum/depsolve.py:237 ../yum/depsolve.py:870 #, python-format msgid "%s converted to install" msgstr "" -#: ../yum/depsolve.py:233 -+#: ../yum/depsolve.py:250 ++#: ../yum/depsolve.py:249 #, python-format msgid "Adding Package %s in mode %s" msgstr "" -#: ../yum/depsolve.py:249 -+#: ../yum/depsolve.py:266 ++#: ../yum/depsolve.py:265 #, python-format msgid "Removing Package %s" msgstr "" -#: ../yum/depsolve.py:271 -+#: ../yum/depsolve.py:288 ++#: ../yum/depsolve.py:287 #, python-format msgid "%s requires: %s" msgstr "" -#: ../yum/depsolve.py:312 -+#: ../yum/depsolve.py:329 ++#: ../yum/depsolve.py:328 #, python-format msgid "%s requires %s" msgstr "" -#: ../yum/depsolve.py:339 -+#: ../yum/depsolve.py:356 ++#: ../yum/depsolve.py:355 msgid "Needed Require has already been looked up, cheating" msgstr "" -#: ../yum/depsolve.py:349 -+#: ../yum/depsolve.py:366 ++#: ../yum/depsolve.py:365 #, python-format msgid "Needed Require is not a package name. Looking up: %s" msgstr "" -#: ../yum/depsolve.py:357 -+#: ../yum/depsolve.py:374 ++#: ../yum/depsolve.py:373 #, python-format msgid "Potential Provider: %s" msgstr "" -#: ../yum/depsolve.py:380 -+#: ../yum/depsolve.py:397 ++#: ../yum/depsolve.py:396 #, python-format msgid "Mode is %s for provider of %s: %s" msgstr "" -#: ../yum/depsolve.py:384 -+#: ../yum/depsolve.py:401 ++#: ../yum/depsolve.py:400 #, python-format msgid "Mode for pkg providing %s: %s" msgstr "" -@@ -2045,991 +2154,1026 @@ msgstr "" +@@ -2045,991 +2160,1027 @@ msgstr "" #. the thing it needs is being updated or obsoleted away #. try to update the requiring package in hopes that all this problem goes #. away :( -#: ../yum/depsolve.py:389 ../yum/depsolve.py:406 -+#: ../yum/depsolve.py:406 ../yum/depsolve.py:441 ++#: ../yum/depsolve.py:405 ../yum/depsolve.py:440 #, python-format msgid "Trying to update %s to resolve dep" msgstr "" -#: ../yum/depsolve.py:400 ../yum/depsolve.py:410 -+#: ../yum/depsolve.py:435 ../yum/depsolve.py:445 ++#: ../yum/depsolve.py:434 ../yum/depsolve.py:444 #, python-format msgid "No update paths found for %s. Failure!" msgstr "" -#: ../yum/depsolve.py:416 -+#: ../yum/depsolve.py:451 ++#: ../yum/depsolve.py:450 #, python-format msgid "TSINFO: %s package requiring %s marked as erase" msgstr "" -#: ../yum/depsolve.py:429 -+#: ../yum/depsolve.py:464 ++#: ../yum/depsolve.py:463 #, python-format msgid "TSINFO: Obsoleting %s with %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:432 -+#: ../yum/depsolve.py:467 ++#: ../yum/depsolve.py:466 #, python-format msgid "TSINFO: Updating %s to resolve dep." msgstr "" -#: ../yum/depsolve.py:440 -+#: ../yum/depsolve.py:475 ++#: ../yum/depsolve.py:474 #, python-format msgid "Cannot find an update path for dep for: %s" msgstr "" -#: ../yum/depsolve.py:471 -+#: ../yum/depsolve.py:506 ++#: ../yum/depsolve.py:505 #, python-format msgid "Quick matched %s to require for %s" msgstr "" #. is it already installed? -#: ../yum/depsolve.py:513 -+#: ../yum/depsolve.py:548 ++#: ../yum/depsolve.py:547 #, python-format msgid "%s is in providing packages but it is already installed, removing." msgstr "" -#: ../yum/depsolve.py:529 -+#: ../yum/depsolve.py:564 ++#: ../yum/depsolve.py:563 #, python-format msgid "Potential resolving package %s has newer instance in ts." msgstr "" -#: ../yum/depsolve.py:540 -+#: ../yum/depsolve.py:575 ++#: ../yum/depsolve.py:574 #, python-format msgid "Potential resolving package %s has newer instance installed." msgstr "" -#: ../yum/depsolve.py:558 -+#: ../yum/depsolve.py:593 ++#: ../yum/depsolve.py:592 #, python-format msgid "%s already in ts, skipping this one" msgstr "" -#: ../yum/depsolve.py:607 -+#: ../yum/depsolve.py:642 ++#: ../yum/depsolve.py:641 #, python-format msgid "TSINFO: Marking %s as update for %s" msgstr "" -#: ../yum/depsolve.py:616 -+#: ../yum/depsolve.py:651 ++#: ../yum/depsolve.py:650 #, python-format msgid "TSINFO: Marking %s as install for %s" msgstr "" -#: ../yum/depsolve.py:727 ../yum/depsolve.py:819 -+#: ../yum/depsolve.py:786 ../yum/depsolve.py:901 ++#: ../yum/depsolve.py:785 ../yum/depsolve.py:900 msgid "Success - empty transaction" msgstr "" -#: ../yum/depsolve.py:767 ../yum/depsolve.py:783 -+#: ../yum/depsolve.py:826 ../yum/depsolve.py:861 ++#: ../yum/depsolve.py:825 ../yum/depsolve.py:860 msgid "Restarting Loop" msgstr "" -#: ../yum/depsolve.py:799 -+#: ../yum/depsolve.py:881 ++#: ../yum/depsolve.py:880 msgid "Dependency Process ending" msgstr "" -#: ../yum/depsolve.py:821 -+#: ../yum/depsolve.py:903 ++#: ../yum/depsolve.py:902 msgid "Success - deps resolved" msgstr "" -#: ../yum/depsolve.py:845 -+#: ../yum/depsolve.py:927 ++#: ../yum/depsolve.py:926 #, python-format msgid "Checking deps for %s" msgstr "" -#: ../yum/depsolve.py:931 -+#: ../yum/depsolve.py:1013 ++#: ../yum/depsolve.py:1012 #, python-format msgid "looking for %s as a requirement of %s" msgstr "" -#: ../yum/depsolve.py:1169 -+#: ../yum/depsolve.py:1256 ++#: ../yum/depsolve.py:1255 #, python-format msgid "Running compare_providers() for %s" msgstr "" -#: ../yum/depsolve.py:1196 ../yum/depsolve.py:1202 -+#: ../yum/depsolve.py:1283 ../yum/depsolve.py:1289 ++#: ../yum/depsolve.py:1282 ../yum/depsolve.py:1288 #, python-format msgid "better arch in po %s" msgstr "" -#: ../yum/depsolve.py:1298 -+#: ../yum/depsolve.py:1385 ++#: ../yum/depsolve.py:1384 #, python-format msgid "%s obsoletes %s" msgstr "" -#: ../yum/depsolve.py:1310 -+#: ../yum/depsolve.py:1397 ++#: ../yum/depsolve.py:1396 #, python-format msgid "" "archdist compared %s to %s on %s\n" @@ -143578,43 +146802,43 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/depsolve.py:1318 -+#: ../yum/depsolve.py:1405 ++#: ../yum/depsolve.py:1404 #, python-format msgid "common sourcerpm %s and %s" msgstr "" -#: ../yum/depsolve.py:1322 -+#: ../yum/depsolve.py:1409 ++#: ../yum/depsolve.py:1408 #, python-format msgid "base package %s is installed for %s" msgstr "" -#: ../yum/depsolve.py:1328 -+#: ../yum/depsolve.py:1415 ++#: ../yum/depsolve.py:1414 #, python-format msgid "common prefix of %s between %s and %s" msgstr "" -#: ../yum/depsolve.py:1359 -+#: ../yum/depsolve.py:1446 ++#: ../yum/depsolve.py:1445 #, python-format msgid "requires minimal: %d" msgstr "" -#: ../yum/depsolve.py:1363 -+#: ../yum/depsolve.py:1450 ++#: ../yum/depsolve.py:1449 #, python-format msgid " Winner: %s" msgstr "" -#: ../yum/depsolve.py:1368 -+#: ../yum/depsolve.py:1455 ++#: ../yum/depsolve.py:1454 #, python-format msgid " Loser(with %d): %s" msgstr "" -#: ../yum/depsolve.py:1384 -+#: ../yum/depsolve.py:1471 ++#: ../yum/depsolve.py:1470 #, python-format msgid "Best Order: %s" msgstr "" @@ -143827,7 +147051,7 @@ index 704a726..c970fec 100644 #. maybe a file log here, too #. but raising an exception is not going to do any good -#: ../yum/__init__.py:1590 -+#: ../yum/__init__.py:1700 ++#: ../yum/__init__.py:1711 #, python-format msgid "%s was supposed to be installed but is not!" msgstr "" @@ -143838,40 +147062,46 @@ index 704a726..c970fec 100644 +#. Note: This actually triggers atm. because we can't +#. always find the erased txmbr to set it when +#. we should. -+#: ../yum/__init__.py:1769 ++#: ../yum/__init__.py:1782 #, python-format msgid "%s was supposed to be removed but is not!" msgstr "" -#: ../yum/__init__.py:1768 -+#: ../yum/__init__.py:1896 ++#. Another copy seems to be running. ++#: ../yum/__init__.py:1917 #, python-format - msgid "Could not open lock %s: %s" +-msgid "Could not open lock %s: %s" ++msgid "Existing lock %s: another copy is running as pid %s." msgstr "" #. Whoa. What the heck happened? -#: ../yum/__init__.py:1785 -+#: ../yum/__init__.py:1913 ++#: ../yum/__init__.py:1966 #, python-format - msgid "Unable to check if PID %s is active" +-msgid "Unable to check if PID %s is active" ++msgid "Could not create lock at %s: %s " msgstr "" - #. Another copy seems to be running. +-#. Another copy seems to be running. -#: ../yum/__init__.py:1789 -+#: ../yum/__init__.py:1917 ++#: ../yum/__init__.py:1978 #, python-format - msgid "Existing lock %s: another copy is running as pid %s." +-msgid "Existing lock %s: another copy is running as pid %s." ++msgid "Could not open lock %s: %s" msgstr "" ++#. The pid doesn't exist #. Whoa. What the heck happened? -#: ../yum/__init__.py:1830 -+#: ../yum/__init__.py:1965 ++#: ../yum/__init__.py:1995 #, python-format - msgid "Could not create lock at %s: %s " +-msgid "Could not create lock at %s: %s " ++msgid "Unable to check if PID %s is active" msgstr "" -#: ../yum/__init__.py:1875 -+#: ../yum/__init__.py:2018 ++#: ../yum/__init__.py:2045 #, python-format msgid "" "Package does not match intended download. Suggestion: run yum " @@ -143879,23 +147109,23 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:1891 -+#: ../yum/__init__.py:2041 ++#: ../yum/__init__.py:2068 msgid "Could not perform checksum" msgstr "" -#: ../yum/__init__.py:1894 -+#: ../yum/__init__.py:2044 ++#: ../yum/__init__.py:2071 msgid "Package does not match checksum" msgstr "" -#: ../yum/__init__.py:1946 -+#: ../yum/__init__.py:2107 ++#: ../yum/__init__.py:2134 #, python-format msgid "package fails checksum but caching is enabled for %s" msgstr "" -#: ../yum/__init__.py:1949 ../yum/__init__.py:1979 -+#: ../yum/__init__.py:2110 ../yum/__init__.py:2140 ++#: ../yum/__init__.py:2137 ../yum/__init__.py:2167 #, python-format msgid "using local copy of %s" msgstr "" @@ -143909,67 +147139,67 @@ index 704a726..c970fec 100644 -msgstr "" - -#: ../yum/__init__.py:2052 -+#: ../yum/__init__.py:2218 ++#: ../yum/__init__.py:2245 msgid "Header is not complete." msgstr "" -#: ../yum/__init__.py:2089 -+#: ../yum/__init__.py:2258 ++#: ../yum/__init__.py:2285 #, python-format msgid "" "Header not in local cache and caching-only mode enabled. Cannot download %s" msgstr "" -#: ../yum/__init__.py:2147 -+#: ../yum/__init__.py:2318 ++#: ../yum/__init__.py:2345 #, python-format msgid "Public key for %s is not installed" msgstr "" -#: ../yum/__init__.py:2151 -+#: ../yum/__init__.py:2322 ++#: ../yum/__init__.py:2349 #, python-format msgid "Problem opening package %s" msgstr "" -#: ../yum/__init__.py:2159 -+#: ../yum/__init__.py:2330 ++#: ../yum/__init__.py:2357 #, python-format msgid "Public key for %s is not trusted" msgstr "" -#: ../yum/__init__.py:2163 -+#: ../yum/__init__.py:2334 ++#: ../yum/__init__.py:2361 #, python-format msgid "Package %s is not signed" msgstr "" -#: ../yum/__init__.py:2202 -+#: ../yum/__init__.py:2376 ++#: ../yum/__init__.py:2403 #, python-format msgid "Cannot remove %s" msgstr "" -#: ../yum/__init__.py:2206 -+#: ../yum/__init__.py:2380 ++#: ../yum/__init__.py:2407 #, python-format msgid "%s removed" msgstr "" -#: ../yum/__init__.py:2252 -+#: ../yum/__init__.py:2439 ++#: ../yum/__init__.py:2466 #, python-format msgid "Cannot remove %s file %s" msgstr "" -#: ../yum/__init__.py:2256 -+#: ../yum/__init__.py:2443 ++#: ../yum/__init__.py:2470 #, python-format msgid "%s file %s removed" msgstr "" -#: ../yum/__init__.py:2258 -+#: ../yum/__init__.py:2445 ++#: ../yum/__init__.py:2472 #, python-format -msgid "%d %s files removed" -msgstr "" @@ -143978,26 +147208,26 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../yum/__init__.py:2327 -+#: ../yum/__init__.py:2535 ++#: ../yum/__init__.py:2562 #, python-format msgid "More than one identical match in sack for %s" msgstr "" -#: ../yum/__init__.py:2333 -+#: ../yum/__init__.py:2541 ++#: ../yum/__init__.py:2568 #, python-format msgid "Nothing matches %s.%s %s:%s-%s from update" msgstr "" -#: ../yum/__init__.py:2632 -+#: ../yum/__init__.py:2905 ++#: ../yum/__init__.py:2932 msgid "" "searchPackages() will go away in a future version of Yum." " Use searchGenerator() instead. \n" msgstr "" -#: ../yum/__init__.py:2675 -+#: ../yum/__init__.py:2961 ++#: ../yum/__init__.py:2988 #, python-format -msgid "Searching %d packages" -msgstr "" @@ -144006,62 +147236,62 @@ index 704a726..c970fec 100644 +msgstr[0] "" -#: ../yum/__init__.py:2679 -+#: ../yum/__init__.py:2965 ++#: ../yum/__init__.py:2992 #, python-format msgid "searching package %s" msgstr "" -#: ../yum/__init__.py:2691 -+#: ../yum/__init__.py:2977 ++#: ../yum/__init__.py:3004 msgid "searching in file entries" msgstr "" -#: ../yum/__init__.py:2698 -+#: ../yum/__init__.py:2984 ++#: ../yum/__init__.py:3011 msgid "searching in provides entries" msgstr "" -#: ../yum/__init__.py:2777 -+#: ../yum/__init__.py:3069 ++#: ../yum/__init__.py:3096 msgid "No group data available for configured repositories" msgstr "" -#: ../yum/__init__.py:2808 ../yum/__init__.py:2827 ../yum/__init__.py:2858 -#: ../yum/__init__.py:2864 ../yum/__init__.py:2953 ../yum/__init__.py:2957 -#: ../yum/__init__.py:3339 -+#: ../yum/__init__.py:3105 ../yum/__init__.py:3125 ../yum/__init__.py:3160 -+#: ../yum/__init__.py:3166 ../yum/__init__.py:3259 ../yum/__init__.py:3263 -+#: ../yum/__init__.py:3715 ++#: ../yum/__init__.py:3132 ../yum/__init__.py:3152 ../yum/__init__.py:3187 ++#: ../yum/__init__.py:3193 ../yum/__init__.py:3286 ../yum/__init__.py:3290 ++#: ../yum/__init__.py:3742 #, python-format msgid "No Group named %s exists" msgstr "" -#: ../yum/__init__.py:2839 ../yum/__init__.py:2973 -+#: ../yum/__init__.py:3137 ../yum/__init__.py:3279 ++#: ../yum/__init__.py:3164 ../yum/__init__.py:3306 #, python-format msgid "package %s was not marked in group %s" msgstr "" -#: ../yum/__init__.py:2887 -+#: ../yum/__init__.py:3189 ++#: ../yum/__init__.py:3216 #, python-format msgid "Adding package %s from group %s" msgstr "" -#: ../yum/__init__.py:2891 -+#: ../yum/__init__.py:3193 ++#: ../yum/__init__.py:3220 #, python-format msgid "No package named %s available to be installed" msgstr "" -#: ../yum/__init__.py:2941 -+#: ../yum/__init__.py:3243 ++#: ../yum/__init__.py:3270 #, python-format msgid "Warning: Group %s does not have any packages." msgstr "" -#: ../yum/__init__.py:2943 -+#: ../yum/__init__.py:3245 ++#: ../yum/__init__.py:3272 #, python-format msgid "Group %s does have %u conditional packages, which may get installed." msgstr "" @@ -144069,79 +147299,79 @@ index 704a726..c970fec 100644 #. This can happen due to excludes after .up has #. happened. -#: ../yum/__init__.py:3002 -+#: ../yum/__init__.py:3317 ++#: ../yum/__init__.py:3344 #, python-format msgid "Package tuple %s could not be found in packagesack" msgstr "" -#: ../yum/__init__.py:3022 -+#: ../yum/__init__.py:3345 ++#: ../yum/__init__.py:3372 #, python-format msgid "Package tuple %s could not be found in rpmdb" msgstr "" -#: ../yum/__init__.py:3079 ../yum/__init__.py:3129 -+#: ../yum/__init__.py:3408 ../yum/__init__.py:3470 ++#: ../yum/__init__.py:3435 ../yum/__init__.py:3497 #, python-format msgid "Invalid version flag from: %s" msgstr "" -#: ../yum/__init__.py:3096 ../yum/__init__.py:3101 -+#: ../yum/__init__.py:3432 ../yum/__init__.py:3437 ../yum/__init__.py:3494 -+#: ../yum/__init__.py:3499 ++#: ../yum/__init__.py:3459 ../yum/__init__.py:3464 ../yum/__init__.py:3521 ++#: ../yum/__init__.py:3526 #, python-format msgid "No Package found for %s" msgstr "" -#: ../yum/__init__.py:3401 -+#: ../yum/__init__.py:3799 ++#: ../yum/__init__.py:3826 msgid "Package Object was not a package object instance" msgstr "" -#: ../yum/__init__.py:3405 -+#: ../yum/__init__.py:3803 ++#: ../yum/__init__.py:3830 msgid "Nothing specified to install" msgstr "" -#: ../yum/__init__.py:3424 ../yum/__init__.py:4283 -+#: ../yum/__init__.py:3822 ../yum/__init__.py:4724 ++#: ../yum/__init__.py:3849 ../yum/__init__.py:4751 #, python-format msgid "Checking for virtual provide or file-provide for %s" msgstr "" -#: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969 -#: ../yum/__init__.py:4289 -+#: ../yum/__init__.py:3828 ../yum/__init__.py:4192 ../yum/__init__.py:4394 -+#: ../yum/__init__.py:4730 ++#: ../yum/__init__.py:3855 ../yum/__init__.py:4219 ../yum/__init__.py:4421 ++#: ../yum/__init__.py:4757 #, python-format msgid "No Match for argument: %s" msgstr "" -#: ../yum/__init__.py:3507 -+#: ../yum/__init__.py:3905 ++#: ../yum/__init__.py:3932 #, python-format msgid "Package %s installed and not available" msgstr "" -#: ../yum/__init__.py:3510 -+#: ../yum/__init__.py:3908 ++#: ../yum/__init__.py:3935 msgid "No package(s) available to install" msgstr "" -#: ../yum/__init__.py:3522 -+#: ../yum/__init__.py:3920 ++#: ../yum/__init__.py:3947 #, python-format msgid "Package: %s - already in transaction set" msgstr "" -#: ../yum/__init__.py:3550 -+#: ../yum/__init__.py:3948 ++#: ../yum/__init__.py:3975 #, python-format msgid "Package %s is obsoleted by %s which is already installed" msgstr "" -#: ../yum/__init__.py:3555 -+#: ../yum/__init__.py:3953 ++#: ../yum/__init__.py:3980 #, python-format msgid "" "Package %s is obsoleted by %s, but obsoleting package does not provide for " @@ -144149,118 +147379,118 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:3558 -+#: ../yum/__init__.py:3956 ++#: ../yum/__init__.py:3983 #, python-format msgid "Package %s is obsoleted by %s, trying to install %s instead" msgstr "" -#: ../yum/__init__.py:3566 -+#: ../yum/__init__.py:3964 ++#: ../yum/__init__.py:3991 #, python-format msgid "Package %s already installed and latest version" msgstr "" -#: ../yum/__init__.py:3580 -+#: ../yum/__init__.py:3978 ++#: ../yum/__init__.py:4005 #, python-format msgid "Package matching %s already installed. Checking for update." msgstr "" #. update everything (the easy case) -#: ../yum/__init__.py:3684 -+#: ../yum/__init__.py:4101 ++#: ../yum/__init__.py:4128 msgid "Updating Everything" msgstr "" -#: ../yum/__init__.py:3708 ../yum/__init__.py:3849 ../yum/__init__.py:3879 -#: ../yum/__init__.py:3915 -+#: ../yum/__init__.py:4125 ../yum/__init__.py:4267 ../yum/__init__.py:4297 -+#: ../yum/__init__.py:4333 ++#: ../yum/__init__.py:4152 ../yum/__init__.py:4294 ../yum/__init__.py:4324 ++#: ../yum/__init__.py:4360 #, python-format msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3753 ../yum/__init__.py:3965 -+#: ../yum/__init__.py:4170 ../yum/__init__.py:4390 ++#: ../yum/__init__.py:4197 ../yum/__init__.py:4417 #, python-format msgid "%s" msgstr "" -#: ../yum/__init__.py:3838 -+#: ../yum/__init__.py:4210 ++#: ../yum/__init__.py:4237 +#, python-format +msgid "No package matched to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:4256 ++#: ../yum/__init__.py:4283 #, python-format msgid "Package is already obsoleted: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3874 -+#: ../yum/__init__.py:4292 ++#: ../yum/__init__.py:4319 #, python-format msgid "Not Updating Package that is obsoleted: %s" msgstr "" -#: ../yum/__init__.py:3883 ../yum/__init__.py:3919 -+#: ../yum/__init__.py:4301 ../yum/__init__.py:4337 ++#: ../yum/__init__.py:4328 ../yum/__init__.py:4364 #, python-format msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s" msgstr "" -#: ../yum/__init__.py:3982 -msgid "No package matched to remove" -+#: ../yum/__init__.py:4407 ++#: ../yum/__init__.py:4434 +#, python-format +msgid "No package matched to remove: %s" msgstr "" -#: ../yum/__init__.py:3988 -+#: ../yum/__init__.py:4413 ++#: ../yum/__init__.py:4440 #, python-format msgid "Skipping the running kernel: %s" msgstr "" -#: ../yum/__init__.py:3994 -+#: ../yum/__init__.py:4419 ++#: ../yum/__init__.py:4446 #, python-format msgid "Removing %s from the transaction" msgstr "" -#: ../yum/__init__.py:4029 -+#: ../yum/__init__.py:4456 ++#: ../yum/__init__.py:4483 #, python-format msgid "Cannot open: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226 -+#: ../yum/__init__.py:4459 ../yum/__init__.py:4576 ../yum/__init__.py:4661 ++#: ../yum/__init__.py:4486 ../yum/__init__.py:4603 ../yum/__init__.py:4688 #, python-format msgid "Examining %s: %s" msgstr "" -#: ../yum/__init__.py:4036 -+#: ../yum/__init__.py:4463 ++#: ../yum/__init__.py:4490 #, python-format msgid "Cannot localinstall deltarpm: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4045 ../yum/__init__.py:4153 ../yum/__init__.py:4229 -+#: ../yum/__init__.py:4472 ../yum/__init__.py:4579 ../yum/__init__.py:4664 ++#: ../yum/__init__.py:4499 ../yum/__init__.py:4606 ../yum/__init__.py:4691 #, python-format msgid "" "Cannot add package %s to transaction. Not a compatible architecture: %s" msgstr "" -#: ../yum/__init__.py:4051 -+#: ../yum/__init__.py:4478 ++#: ../yum/__init__.py:4505 #, python-format msgid "Cannot install package %s. It is obsoleted by installed package %s" msgstr "" -#: ../yum/__init__.py:4059 -+#: ../yum/__init__.py:4486 ++#: ../yum/__init__.py:4513 #, python-format msgid "" "Package %s not installed, cannot update it. Run yum install to install it " @@ -144268,7 +147498,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:4078 ../yum/__init__.py:4085 -+#: ../yum/__init__.py:4505 ../yum/__init__.py:4512 ++#: ../yum/__init__.py:4532 ../yum/__init__.py:4539 #, python-format msgid "" "Package %s.%s not installed, cannot update it. Run yum install to install it" @@ -144276,118 +147506,118 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234 -+#: ../yum/__init__.py:4521 ../yum/__init__.py:4584 ../yum/__init__.py:4669 ++#: ../yum/__init__.py:4548 ../yum/__init__.py:4611 ../yum/__init__.py:4696 #, python-format msgid "Excluding %s" msgstr "" -#: ../yum/__init__.py:4099 -+#: ../yum/__init__.py:4526 ++#: ../yum/__init__.py:4553 #, python-format msgid "Marking %s to be installed" msgstr "" -#: ../yum/__init__.py:4105 -+#: ../yum/__init__.py:4532 ++#: ../yum/__init__.py:4559 #, python-format msgid "Marking %s as an update to %s" msgstr "" -#: ../yum/__init__.py:4112 -+#: ../yum/__init__.py:4539 ++#: ../yum/__init__.py:4566 #, python-format msgid "%s: does not update installed package." msgstr "" -#: ../yum/__init__.py:4147 ../yum/__init__.py:4223 -+#: ../yum/__init__.py:4573 ../yum/__init__.py:4658 ++#: ../yum/__init__.py:4600 ../yum/__init__.py:4685 #, python-format msgid "Cannot open file: %s. Skipping." msgstr "" -#: ../yum/__init__.py:4177 -+#: ../yum/__init__.py:4613 ++#: ../yum/__init__.py:4640 msgid "Problem in reinstall: no package matched to remove" msgstr "" -#: ../yum/__init__.py:4203 -+#: ../yum/__init__.py:4639 ++#: ../yum/__init__.py:4666 #, python-format msgid "Problem in reinstall: no package %s matched to install" msgstr "" -#: ../yum/__init__.py:4311 -+#: ../yum/__init__.py:4752 ++#: ../yum/__init__.py:4779 msgid "No package(s) available to downgrade" msgstr "" -#: ../yum/__init__.py:4319 -+#: ../yum/__init__.py:4760 ++#: ../yum/__init__.py:4787 #, python-format msgid "Package %s is allowed multiple installs, skipping" msgstr "" -#: ../yum/__init__.py:4365 -+#: ../yum/__init__.py:4806 ++#: ../yum/__init__.py:4833 #, python-format msgid "No Match for available package: %s" msgstr "" -#: ../yum/__init__.py:4372 -+#: ../yum/__init__.py:4813 ++#: ../yum/__init__.py:4840 #, python-format msgid "Only Upgrade available on package: %s" msgstr "" -#: ../yum/__init__.py:4442 ../yum/__init__.py:4479 -+#: ../yum/__init__.py:4926 ../yum/__init__.py:4993 ++#: ../yum/__init__.py:4953 ../yum/__init__.py:5020 #, python-format msgid "Failed to downgrade: %s" msgstr "" -#: ../yum/__init__.py:4516 -+#: ../yum/__init__.py:4943 ../yum/__init__.py:4999 ++#: ../yum/__init__.py:4970 ../yum/__init__.py:5026 +#, python-format +msgid "Failed to upgrade: %s" +msgstr "" + -+#: ../yum/__init__.py:5032 ++#: ../yum/__init__.py:5059 #, python-format msgid "Retrieving key from %s" msgstr "" -#: ../yum/__init__.py:4534 -+#: ../yum/__init__.py:5050 ++#: ../yum/__init__.py:5077 msgid "GPG key retrieval failed: " msgstr "" #. if we decide we want to check, even though the sig failed #. here is where we would do that -#: ../yum/__init__.py:4557 -+#: ../yum/__init__.py:5073 ++#: ../yum/__init__.py:5100 #, python-format msgid "GPG key signature on key %s does not match CA Key for repo: %s" msgstr "" -#: ../yum/__init__.py:4559 -+#: ../yum/__init__.py:5075 ++#: ../yum/__init__.py:5102 msgid "GPG key signature verified against CA Key(s)" msgstr "" -#: ../yum/__init__.py:4567 -+#: ../yum/__init__.py:5083 ++#: ../yum/__init__.py:5110 #, python-format msgid "Invalid GPG Key from %s: %s" msgstr "" -#: ../yum/__init__.py:4576 -+#: ../yum/__init__.py:5092 ++#: ../yum/__init__.py:5119 #, python-format msgid "GPG key parsing failed: key does not have value %s" msgstr "" -#: ../yum/__init__.py:4592 -+#: ../yum/__init__.py:5108 ++#: ../yum/__init__.py:5135 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -144401,7 +147631,7 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:4600 -+#: ../yum/__init__.py:5118 ++#: ../yum/__init__.py:5145 #, python-format msgid "" "Importing %s key 0x%s:\n" @@ -144413,29 +147643,29 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:4634 -+#: ../yum/__init__.py:5153 ++#: ../yum/__init__.py:5180 #, python-format msgid "GPG key at %s (0x%s) is already installed" msgstr "" -#: ../yum/__init__.py:4671 -+#: ../yum/__init__.py:5192 ++#: ../yum/__init__.py:5219 #, python-format msgid "Key import failed (code %d)" msgstr "" -#: ../yum/__init__.py:4672 ../yum/__init__.py:4755 -+#: ../yum/__init__.py:5193 ../yum/__init__.py:5279 ++#: ../yum/__init__.py:5220 ../yum/__init__.py:5306 msgid "Key imported successfully" msgstr "" -#: ../yum/__init__.py:4676 -+#: ../yum/__init__.py:5197 ++#: ../yum/__init__.py:5224 msgid "Didn't install any keys" msgstr "" -#: ../yum/__init__.py:4680 -+#: ../yum/__init__.py:5201 ++#: ../yum/__init__.py:5228 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n" @@ -144443,29 +147673,29 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:4689 -+#: ../yum/__init__.py:5210 ++#: ../yum/__init__.py:5237 msgid "Import of key(s) didn't help, wrong key(s)?" msgstr "" -#: ../yum/__init__.py:4713 -+#: ../yum/__init__.py:5234 ++#: ../yum/__init__.py:5261 #, python-format msgid "GPG key at %s (0x%s) is already imported" msgstr "" -#: ../yum/__init__.py:4754 -+#: ../yum/__init__.py:5278 ++#: ../yum/__init__.py:5305 msgid "Key import failed" msgstr "" -#: ../yum/__init__.py:4770 -+#: ../yum/__init__.py:5294 ++#: ../yum/__init__.py:5321 #, python-format msgid "Didn't install any keys for repo %s" msgstr "" -#: ../yum/__init__.py:4774 -+#: ../yum/__init__.py:5298 ++#: ../yum/__init__.py:5325 #, python-format msgid "" "The GPG keys listed for the \"%s\" repository are already installed but they are not correct.\n" @@ -144473,117 +147703,117 @@ index 704a726..c970fec 100644 msgstr "" -#: ../yum/__init__.py:4924 -+#: ../yum/__init__.py:5448 ++#: ../yum/__init__.py:5475 msgid "Unable to find a suitable mirror." msgstr "" -#: ../yum/__init__.py:4926 -+#: ../yum/__init__.py:5450 ++#: ../yum/__init__.py:5477 msgid "Errors were encountered while downloading packages." msgstr "" -#: ../yum/__init__.py:4981 -+#: ../yum/__init__.py:5505 ++#: ../yum/__init__.py:5532 #, python-format msgid "Please report this error at %s" msgstr "" -#: ../yum/__init__.py:4998 -+#: ../yum/__init__.py:5522 ++#: ../yum/__init__.py:5549 msgid "Test Transaction Errors: " msgstr "" -#: ../yum/__init__.py:5098 -+#: ../yum/__init__.py:5634 ++#: ../yum/__init__.py:5661 #, python-format msgid "Could not set cachedir: %s" msgstr "" -#: ../yum/__init__.py:5148 ../yum/__init__.py:5150 -+#: ../yum/__init__.py:5695 ../yum/__init__.py:5697 ++#: ../yum/__init__.py:5722 ../yum/__init__.py:5724 msgid "Dependencies not solved. Will not save unresolved transaction." msgstr "" -#: ../yum/__init__.py:5179 ../yum/__init__.py:5181 -+#: ../yum/__init__.py:5726 ../yum/__init__.py:5728 ++#: ../yum/__init__.py:5753 ../yum/__init__.py:5755 #, python-format msgid "Could not save transaction file %s: %s" msgstr "" -#: ../yum/__init__.py:5195 -+#: ../yum/__init__.py:5752 ++#: ../yum/__init__.py:5779 #, python-format msgid "Could not access/read saved transaction %s : %s" msgstr "" -#: ../yum/__init__.py:5214 -+#: ../yum/__init__.py:5781 ++#: ../yum/__init__.py:5808 msgid "rpmdb ver mismatched saved transaction version, " msgstr "" -#: ../yum/__init__.py:5216 -+#: ../yum/__init__.py:5783 ++#: ../yum/__init__.py:5810 msgid " ignoring, as requested." msgstr "" -#: ../yum/__init__.py:5219 ../yum/__init__.py:5354 -+#: ../yum/__init__.py:5786 ../yum/__init__.py:5921 ++#: ../yum/__init__.py:5813 ../yum/__init__.py:5949 msgid " aborting." msgstr "" -#: ../yum/__init__.py:5228 -+#: ../yum/__init__.py:5795 ++#: ../yum/__init__.py:5822 msgid "cannot find tsflags or tsflags not integer." msgstr "" -#: ../yum/__init__.py:5267 -+#: ../yum/__init__.py:5834 ++#: ../yum/__init__.py:5862 #, python-format msgid "Found txmbr in unknown current state: %s" msgstr "" -#: ../yum/__init__.py:5271 -+#: ../yum/__init__.py:5838 ++#: ../yum/__init__.py:5866 #, python-format msgid "Could not find txmbr: %s in state %s" msgstr "" -#: ../yum/__init__.py:5307 ../yum/__init__.py:5324 -+#: ../yum/__init__.py:5874 ../yum/__init__.py:5891 ++#: ../yum/__init__.py:5902 ../yum/__init__.py:5919 #, python-format msgid "Could not find txmbr: %s from origin: %s" msgstr "" -#: ../yum/__init__.py:5349 -+#: ../yum/__init__.py:5916 ++#: ../yum/__init__.py:5944 msgid "Transaction members, relations are missing or ts has been modified," msgstr "" -#: ../yum/__init__.py:5351 -+#: ../yum/__init__.py:5918 ++#: ../yum/__init__.py:5946 msgid " ignoring, as requested. You must redepsolve!" msgstr "" +#. Debugging output -+#: ../yum/__init__.py:5993 ../yum/__init__.py:6012 ++#: ../yum/__init__.py:6021 ../yum/__init__.py:6040 +#, python-format +msgid "%s has been visited already and cannot be removed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:5996 ++#: ../yum/__init__.py:6024 +#, python-format +msgid "Examining revdeps of %s" +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6017 ++#: ../yum/__init__.py:6045 +#, python-format +msgid "%s has revdep %s which was user-installed." +msgstr "" + +#. Debugging output -+#: ../yum/__init__.py:6031 ++#: ../yum/__init__.py:6059 +#, python-format +msgid "%s has no user-installed revdeps." +msgstr "" @@ -144683,10 +147913,15 @@ index 704a726..c970fec 100644 #, python-format msgid "%s provides %s but it cannot be found" msgstr "" -@@ -3038,6 +3182,14 @@ msgstr "" +@@ -3038,6 +3189,19 @@ msgstr "" msgid "Repackaging" msgstr "" ++#: ../yum/rpmtrans.py:149 ++#, python-format ++msgid "Verify: %u/%u: %s" ++msgstr "" ++ +#: ../yum/yumRepo.py:806 +#, python-format +msgid "" @@ -144698,6 +147933,12 @@ index 704a726..c970fec 100644 #: ../rpmUtils/oldUtils.py:33 #, python-format msgid "Header cannot be opened or does not match %s, %s." +@@ -3066,5 +3230,3 @@ msgstr "" + #, python-format + msgid "Error opening rpm %s - error %s" + msgstr "" +- +- diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py index 6082005..7d67907 100644 --- a/rpmUtils/arch.py diff --git a/yum.spec b/yum.spec index eed5a57..1227d0f 100644 --- a/yum.spec +++ b/yum.spec @@ -18,7 +18,7 @@ Summary: RPM package installer/updater/manager Name: yum Version: 3.4.3 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz @@ -311,6 +311,10 @@ exit 0 %endif %changelog +* Thu Mar 1 2012 James Antill - 3.4.3-21 +- update to latest HEAD. +- Translation update. + * Wed Feb 29 2012 James Antill - 3.4.3-20 - update to latest HEAD. - Lazy setup pkgSack, for localinstall/etc.