[yum: 1/2] update to latest HEAD Update translations. Minor UI tweaks for transaction output. Minor tweak for u
James Antill
james at fedoraproject.org
Tue Aug 23 17:33:23 UTC 2011
commit 6d04f83cdd04755a630062c172e69af947d87815
Merge: ba7a3bf b0f9128
Author: James Antill <james at and.org>
Date: Mon Aug 22 17:05:23 2011 -0400
update to latest HEAD
Update translations.
Minor UI tweaks for transaction output.
Minor tweak for update_reqs_on_install.
yum-HEAD.patch | 5117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
yum.spec | 8 +-
2 files changed, 5063 insertions(+), 62 deletions(-)
---
diff --cc yum-HEAD.patch
index 466324e,588bb37..727e372
--- a/yum-HEAD.patch
+++ b/yum-HEAD.patch
@@@ -60,7 -60,7 +60,7 @@@ index 2f6154e..2e5a052 10064
diff --git a/cli.py b/cli.py
old mode 100644
new mode 100755
- index 6056d38..9f2c282
-index 6056d38..3a68616
++index 6056d38..a1e0e03
--- a/cli.py
+++ b/cli.py
@@ -25,7 +25,7 @@ import sys
@@@ -346,7 -346,7 +346,7 @@@
raise yum.Errors.YumBaseError, \
_('Refusing to automatically import keys when running ' \
'unattended.\nUse "-y" to override.')
--@@ -691,12 +737,59 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -691,12 +737,60 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
", ".join(matches))
self.verbose_logger.log(yum.logginglevels.INFO_2, msg)
@@@ -381,7 -381,7 +381,8 @@@
+ return uret
+
+ for txmbr in txmbrs:
--+ print "JDBG:", txmbr
+++ for rtxmbr, T in txmbr.relatedto:
+++ ret += _pkg2ups(rtxmbr)
+ ret += _pkg2ups(txmbr.po)
+
+ return ret
@@@ -411,7 -411,7 +412,7 @@@
# get the list of available packages
# iterate over the user's list
# add packages to Transaction holding class if they match.
--@@ -710,11 +803,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -710,11 +804,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
for arg in userlist:
if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or
os.path.exists(arg))):
@@@ -426,7 -426,7 +427,7 @@@
except yum.Errors.InstallError:
self.verbose_logger.log(yum.logginglevels.INFO_2,
_('No package %s%s%s available.'),
--@@ -723,6 +817,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -723,6 +818,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self._maybeYouMeant(arg)
else:
done = True
@@@ -434,7 -434,7 +435,7 @@@
if len(self.tsInfo) > oldcount:
change = len(self.tsInfo) - oldcount
return 2, [P_('%d package to install', '%d packages to install', change) % change]
--@@ -732,9 +827,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -732,9 +828,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('Nothing to do')]
def updatePkgs(self, userlist, quiet=0, update_to=False):
@@@ -465,7 -465,7 +466,7 @@@
# if there is no userlist, then do global update below
# this is probably 90% of the calls
# if there is a userlist then it's for updating pkgs, not obsoleting
- @@ -745,21 +858,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
-@@ -745,20 +858,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -745,21 +859,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
else:
# go through the userlist - look for items that are local rpms. If we find them
@@@ -492,11 -491,10 +493,11 @@@
+ txmbrs = self.update(pattern=item, update_to=update_to)
+ self._install_upgraded_requires(txmbrs)
+ if not txmbrs:
- self._checkMaybeYouMeant(arg)
++ self._checkMaybeYouMeant(item)
if len(self.tsInfo) > oldcount:
-@@ -770,9 +881,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+ change = len(self.tsInfo) - oldcount
- @@ -770,9 +881,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -770,9 +882,24 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# Note that we aren't in __init__ yet for a couple of reasons, but we
# probably will get there for 3.2.28.
def distroSyncPkgs(self, userlist):
@@@ -524,7 -522,7 +525,7 @@@
level = 'diff'
if userlist and userlist[0] in ('full', 'diff', 'different'):
--@@ -866,9 +992,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -866,9 +993,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('No Packages marked for Distribution Synchronization')]
def erasePkgs(self, userlist):
@@@ -547,7 -545,7 +548,7 @@@
oldcount = len(self.tsInfo)
all_rms = []
--@@ -884,9 +1020,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -884,9 +1021,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('No Packages marked for removal')]
def downgradePkgs(self, userlist):
@@@ -571,7 -569,7 +572,7 @@@
oldcount = len(self.tsInfo)
--@@ -911,20 +1058,32 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -911,20 +1059,32 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('Nothing to do')]
def reinstallPkgs(self, userlist):
@@@ -608,7 -606,7 +609,7 @@@
except yum.Errors.ReinstallRemoveError:
self._checkMaybeYouMeant(arg, always_output=False)
except yum.Errors.ReinstallInstallError, e:
--@@ -940,15 +1099,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -940,15 +1100,27 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
except yum.Errors.ReinstallError, e:
assert False, "Shouldn't happen, but just in case"
self.verbose_logger.log(yum.logginglevels.INFO_2, e)
@@@ -639,7 -637,7 +640,7 @@@
# read in each package into a YumLocalPackage Object
# append it to self.localPackages
# check if it can be installed or updated based on nevra versus rpmdb
--@@ -972,20 +1143,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -972,20 +1144,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('Nothing to do')]
def returnPkgLists(self, extcmds, installed_available=False):
@@@ -679,7 -677,7 +680,7 @@@
special = ['available', 'installed', 'all', 'extras', 'updates', 'recent',
'obsoletes']
--@@ -1017,8 +1193,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1017,8 +1194,25 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return ypl
def search(self, args):
@@@ -707,7 -705,7 +708,7 @@@
# call the yum module search function with lists of tags to search
# and what to search for
--@@ -1108,9 +1301,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1108,9 +1302,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, matching
def deplist(self, args):
@@@ -730,7 -728,7 +731,7 @@@
pkgs = []
for arg in args:
if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or
--@@ -1131,10 +1335,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1131,10 +1336,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, []
def provides(self, args):
@@@ -754,7 -752,7 +755,7 @@@
old_sdup = self.conf.showdupesfromrepos
# For output, as searchPackageProvides() is always in showdups mode
self.conf.showdupesfromrepos = True
--@@ -1163,8 +1376,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1163,8 +1377,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, []
def resolveDepCli(self, args):
@@@ -776,7 -774,7 +777,7 @@@
for arg in args:
try:
pkg = self.returnPackageByDep(arg)
--@@ -1177,6 +1401,34 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1177,6 +1402,34 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, []
def cleanCli(self, userlist):
@@@ -811,7 -809,7 +812,7 @@@
hdrcode = pkgcode = xmlcode = dbcode = expccode = 0
pkgresults = hdrresults = xmlresults = dbresults = expcresults = []
msg = self.fmtKeyValFill(_('Cleaning repos: '),
--@@ -1228,7 +1480,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1228,7 +1481,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return code, []
def returnGroupLists(self, userlist):
@@@ -831,7 -829,7 +832,7 @@@
uservisible=1
if len(userlist) > 0:
--@@ -1283,7 +1547,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1283,7 +1548,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('Done')]
def returnGroupSummary(self, userlist):
@@@ -852,7 -850,7 +853,7 @@@
uservisible=1
if len(userlist) > 0:
--@@ -1327,7 +1604,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1327,7 +1605,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, [_('Done')]
def returnGroupInfo(self, userlist):
@@@ -873,7 -871,7 +874,7 @@@
for strng in userlist:
group_matched = False
for group in self.comps.return_groups(strng):
--@@ -1340,8 +1629,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1340,8 +1630,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 0, []
def installGroups(self, grouplist):
@@@ -894,7 -892,7 +895,7 @@@
pkgs_used = []
for group_string in grouplist:
--@@ -1368,8 +1667,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1368,8 +1668,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return 2, [P_('%d package to Install', '%d packages to Install', len(pkgs_used)) % len(pkgs_used)]
def removeGroups(self, grouplist):
@@@ -914,7 -912,7 +915,7 @@@
pkgs_used = []
for group_string in grouplist:
try:
--@@ -1389,7 +1698,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1389,7 +1699,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
def _promptWanted(self):
# shortcut for the always-off/always-on options
@@@ -923,7 -921,7 +924,7 @@@
return False
if self.conf.alwaysprompt:
return True
--@@ -1400,7 +1709,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1400,7 +1710,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# package wasn't explictly given on the command line
for txmbr in self.tsInfo.getMembers():
if txmbr.isDep or \
@@@ -931,7 -929,7 +932,7 @@@
txmbr.name not in self.extcmds:
return True
--@@ -1408,11 +1716,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1408,11 +1717,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return False
def usage(self):
@@@ -945,7 -943,7 +946,7 @@@
sys.stdout.write(self.optparser.get_usage())
def _installable(self, pkg, ematch=False):
--@@ -1468,9 +1776,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
++@@ -1468,9 +1777,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return False
class YumOptionParser(OptionParser):
@@@ -957,7 -955,7 +958,7 @@@
def __init__(self,base, **kwargs):
# check if this is called with a utils=True/False parameter
--@@ -1488,13 +1796,23 @@ class YumOptionParser(OptionParser):
++@@ -1488,13 +1797,23 @@ class YumOptionParser(OptionParser):
self._addYumBasicOptions()
def error(self, msg):
@@@ -983,7 -981,7 +984,7 @@@
try:
args = _filtercmdline(
('--noplugins','--version','-q', '-v', "--quiet", "--verbose"),
--@@ -1521,7 +1839,15 @@ class YumOptionParser(OptionParser):
++@@ -1521,7 +1840,15 @@ class YumOptionParser(OptionParser):
return ret
def setupYumConfig(self, args=None):
@@@ -1000,7 -998,7 +1001,7 @@@
if not args:
(opts, cmds) = self.parse_args()
else:
--@@ -1536,7 +1862,9 @@ class YumOptionParser(OptionParser):
++@@ -1536,7 +1863,9 @@ class YumOptionParser(OptionParser):
# Handle remaining options
if opts.assumeyes:
@@@ -1011,7 -1009,7 +1012,7 @@@
# Instead of going cache-only for a non-root user, try to use a
# user writable cachedir. If that fails fall back to cache-only.
--@@ -1640,6 +1968,14 @@ class YumOptionParser(OptionParser):
++@@ -1640,6 +1969,14 @@ class YumOptionParser(OptionParser):
sys.exit(1)
def getRoot(self,opts):
@@@ -1026,7 -1024,7 +1027,7 @@@
self._checkAbsInstallRoot(opts)
# If the conf file is inside the installroot - use that.
# otherwise look for it in the normal root
--@@ -1713,6 +2049,10 @@ class YumOptionParser(OptionParser):
++@@ -1713,6 +2050,10 @@ class YumOptionParser(OptionParser):
help=_("verbose operation"))
group.add_option("-y", "--assumeyes", dest="assumeyes",
action="store_true", help=_("answer yes for all questions"))
@@@ -2235,7 -2233,7 +2236,7 @@@ index f1e06e8..2faeb59 10064
;;
version)
diff --git a/output.py b/output.py
--index b6aa277..00e0e6f 100755
++index b6aa277..eefcd69 100755
--- a/output.py
+++ b/output.py
@@ -1,6 +1,6 @@
@@@ -2860,7 -2858,7 +2861,50 @@@
self.tsInfo.makelists(True, True)
pkglist_lines = []
data = {'n' : {}, 'v' : {}, 'r' : {}}
--@@ -1115,6 +1430,12 @@ Transaction Summary
++@@ -1102,19 +1417,46 @@ class YumOutput:
++ Transaction Summary
++ %s
++ """) % ('=' * self.term.columns))
++- for action, count in (
++- (_('Install'), len(self.tsInfo.installed) + len(self.tsInfo.depinstalled)),
++- (_('Upgrade'), len(self.tsInfo.updated) + len(self.tsInfo.depupdated)),
++- (_('Remove'), len(self.tsInfo.removed) + len(self.tsInfo.depremoved)),
++- (_('Reinstall'), len(self.tsInfo.reinstalled)),
++- (_('Downgrade'), len(self.tsInfo.downgraded)),
+++ for action, count, depcount in (
+++ (_('Install'), len(self.tsInfo.installed),
+++ len(self.tsInfo.depinstalled)),
+++ (_('Upgrade'), len(self.tsInfo.updated),
+++ len(self.tsInfo.depupdated)),
+++ (_('Remove'), len(self.tsInfo.removed),
+++ len(self.tsInfo.depremoved)),
+++ (_('Reinstall'), len(self.tsInfo.reinstalled), 0),
+++ (_('Downgrade'), len(self.tsInfo.downgraded), 0),
+++ (_('Skipped (dependency problems)'), len(self.skipped_packages), 0),
+++ (_('Not installed'), len(self._not_found_i.values()), 0),
+++ (_('Not available'), len(self._not_found_a.values()), 0),
++ ):
++- if count: out.append('%-9s %5d %s\n' % (
++- action, count, P_('Package', 'Packages', count),
++- ))
+++ msg_pkgs = P_('Package', 'Packages', count)
+++ if depcount:
+++ msg_deppkgs = P_('Dependent package', 'Dependent packages',
+++ depcount)
+++ max_msg_pkgs = utf8_width(_('Package'))
+++ max_msg_pkgs2 = utf8_width(_('Packages'))
+++ if max_msg_pkgs2 > max_msg_pkgs:
+++ max_msg_pkgs = max_msg_pkgs2
+++ if count:
+++ msg = '%-9s %5d %-*s (+%5d %s)\n'
+++ out.append(msg % (action, count, max_msg_pkgs, msg_pkgs,
+++ depcount, msg_deppkgs))
+++ else:
+++ msg = '%-9s %5s %-*s ( %5d %s)\n'
+++ out.append(msg % (action, '', max_msg_pkgs, '',
+++ depcount, msg_deppkgs))
+++ elif count:
+++ out.append('%-9s %5d %s\n' % (action, count, msg_pkgs))
return ''.join(out)
def postTransactionOutput(self):
@@@ -2873,7 -2871,7 +2917,7 @@@
out = ''
self.tsInfo.makelists()
--@@ -1179,9 +1500,9 @@ Transaction Summary
++@@ -1179,9 +1521,9 @@ Transaction Summary
return out
def setupProgressCallbacks(self):
@@@ -2886,7 -2884,7 +2930,7 @@@
# if we're below 2 on the debug level we don't need to be outputting
# progress bars - this is hacky - I'm open to other options
# One of these is a download
--@@ -1216,10 +1537,12 @@ Transaction Summary
++@@ -1216,10 +1558,12 @@ Transaction Summary
self.dsCallback = dscb
def setupProgessCallbacks(self):
@@@ -2900,27 -2898,27 +2944,27 @@@
confirm_func = self._cli_confirm_gpg_key_import
gpg_import_func = self.getKeyForRepo
gpgca_import_func = self.getCAKeyForRepo
--@@ -1233,14 +1556,12 @@ Transaction Summary
++@@ -1233,14 +1577,12 @@ Transaction Summary
self.repos.gpgca_import_func = gpgca_import_func
def interrupt_callback(self, cbobj):
- '''Handle CTRL-C's during downloads
---
--- If a CTRL-C occurs a URLGrabError will be raised to push the download
--- onto the next mirror.
---
--- If two CTRL-C's occur in quick succession then yum will exit.
+ '''Handle CTRL-C's during downloads. If a CTRL-C occurs a
+ URLGrabError will be raised to push the download onto the next
+ mirror. If two CTRL-C's occur in quick succession then yum
+ will exit.
++- If a CTRL-C occurs a URLGrabError will be raised to push the download
++- onto the next mirror.
++-
++- If two CTRL-C's occur in quick succession then yum will exit.
++-
- @param cbobj: urlgrabber callback obj
+ :param cbobj: :class:`urlgrabber.grabber.CallbackObject`
'''
delta_exit_chk = 2.0 # Delta between C-c's so we treat as exit
delta_exit_str = _("two") # Human readable version of above
--@@ -1269,6 +1590,14 @@ to exit.
++@@ -1269,6 +1611,14 @@ to exit.
def download_callback_total_cb(self, remote_pkgs, remote_size,
download_start_timestamp):
@@@ -2935,7 -2933,7 +2979,7 @@@
if len(remote_pkgs) <= 1:
return
if not hasattr(urlgrabber.progress, 'TerminalLine'):
--@@ -1434,8 +1763,17 @@ to exit.
++@@ -1434,8 +1784,17 @@ to exit.
return tids, printall
def historyListCmd(self, extcmds):
@@@ -2945,16 -2943,16 +2989,16 @@@
+
+ :param extcmds: list of extra command line arguments
+ :return: (exit_code, [errors])
--+
--+ exit_code is::
+++ exit_code is::
+++
+ 0 = we're done, exit
+ 1 = we've errored, exit with error string
+ """
tids, printall = self._history_list_transactions(extcmds)
if tids is None:
return 1, ['Failed history list']
--@@ -1564,6 +1902,16 @@ to exit.
++@@ -1564,6 +1923,16 @@ to exit.
return old[0]
def historyInfoCmd(self, extcmds):
@@@ -2971,7 -2969,7 +3015,7 @@@
def str2int(x):
try:
return int(x)
--@@ -1656,6 +2004,9 @@ to exit.
++@@ -1656,6 +2025,9 @@ to exit.
def _hpkg2from_repo(self, hpkg):
""" Given a pkg, find the ipkg.ui_from_repo ... if none, then
get an apkg. ... and put a ? in there. """
@@@ -2981,7 -2979,7 +3025,7 @@@
ipkgs = self.rpmdb.searchPkgTuple(hpkg.pkgtup)
if not ipkgs:
apkgs = self.pkgSack.searchPkgTuple(hpkg.pkgtup)
--@@ -1833,6 +2184,13 @@ to exit.
++@@ -1833,6 +2205,13 @@ to exit.
'Updated' : _('Updated'),
}
def historyInfoCmdPkgsAltered(self, old, pats=[]):
@@@ -2995,7 -2993,7 +3039,7 @@@
last = None
# Note that these don't use _simple_pkg() because we are showing what
# happened to them in the transaction ... not the difference between the
--@@ -1886,6 +2244,10 @@ to exit.
++@@ -1886,6 +2265,10 @@ to exit.
self._hpkg2from_repo(hpkg))
def historySummaryCmd(self, extcmds):
@@@ -3006,7 -3004,7 +3050,7 @@@
tids, printall = self._history_list_transactions(extcmds)
if tids is None:
return 1, ['Failed history info']
--@@ -1946,6 +2308,10 @@ to exit.
++@@ -1946,6 +2329,10 @@ to exit.
utf8_width_fill(uiacts, 16, 16), count)
def historyAddonInfoCmd(self, extcmds):
@@@ -3017,7 -3015,7 +3061,7 @@@
tid = None
if len(extcmds) > 1:
tid = extcmds[1]
--@@ -1983,16 +2349,19 @@ to exit.
++@@ -1983,16 +2370,19 @@ to exit.
for item in extcmds[2:]:
if item in addon_info:
@@@ -3043,7 -3041,7 +3087,7 @@@
tids = self.history.search(extcmds)
limit = None
if extcmds and not tids:
--@@ -2078,9 +2447,95 @@ to exit.
++@@ -2078,9 +2468,95 @@ to exit.
if lastdbv.end_rpmdbversion != rpmdbv:
self._rpmdb_warn_checks()
@@@ -3140,7 -3138,7 +3184,7 @@@
def __init__(self, ayum=None):
"""requires yum-cli log and errorlog functions as arguments"""
--@@ -2089,6 +2544,25 @@ class DepSolveProgressCallBack:
++@@ -2089,6 +2565,25 @@ class DepSolveProgressCallBack:
self.ayum = ayum
def pkgAdded(self, pkgtup, mode):
@@@ -3166,7 -3164,7 +3210,7 @@@
modedict = { 'i': _('installed'),
'u': _('an update'),
'e': _('erased'),
--@@ -2104,43 +2578,85 @@ class DepSolveProgressCallBack:
++@@ -2104,43 +2599,85 @@ class DepSolveProgressCallBack:
modeterm)
def start(self):
@@@ -3254,7 -3252,7 +3298,7 @@@
needname, needflags, needversion = reqTup
yb = self.ayum
--@@ -2225,45 +2741,89 @@ class DepSolveProgressCallBack:
++@@ -2225,45 +2762,89 @@ class DepSolveProgressCallBack:
return msg
def procConflict(self, name, confname):
@@@ -3348,7 -3346,7 +3392,7 @@@
progressbar(current, total, name)
def _pkgname_ui(ayum, pkgname, ts_states=None):
--@@ -2316,10 +2876,7 @@ def _pkgname_ui(ayum, pkgname, ts_states=None):
++@@ -2316,10 +2897,7 @@ def _pkgname_ui(ayum, pkgname, ts_states=None):
return pkgname
class YumCliRPMCallBack(RPMBaseCallback):
@@@ -3360,7 -3358,7 +3404,7 @@@
width = property(lambda x: _term_width())
--@@ -2337,11 +2894,31 @@ class YumCliRPMCallBack(RPMBaseCallback):
++@@ -2337,11 +2915,31 @@ class YumCliRPMCallBack(RPMBaseCallback):
# Installing things have pkg objects passed to the events, so only need to
# lookup for erased/obsoleted.
def pkgname_ui(self, pkgname, ts_states=('e', 'od', 'ud', None)):
@@@ -3394,7 -3392,7 +3438,7 @@@
process = self.action[action]
if not hasattr(self, '_max_action_wid'):
--@@ -2366,6 +2943,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
++@@ -2366,6 +2964,7 @@ class YumCliRPMCallBack(RPMBaseCallback):
if self.output and (sys.stdout.isatty() or te_current == te_total):
(fmt, wid1, wid2) = self._makefmt(percent, ts_current, ts_total,
@@@ -3402,7 -3400,7 +3446,7 @@@
pkgname=pkgname, wid1=wid1)
msg = fmt % (utf8_width_fill(process, wid1, wid1),
utf8_width_fill(pkgname, wid2, wid2))
--@@ -2377,6 +2955,11 @@ class YumCliRPMCallBack(RPMBaseCallback):
++@@ -2377,6 +2976,11 @@ class YumCliRPMCallBack(RPMBaseCallback):
print " "
def scriptout(self, package, msgs):
@@@ -3414,7 -3412,7 +3458,7 @@@
if msgs:
sys.stdout.write(to_unicode(msgs))
sys.stdout.flush()
--@@ -2431,6 +3014,15 @@ class YumCliRPMCallBack(RPMBaseCallback):
++@@ -2431,6 +3035,15 @@ class YumCliRPMCallBack(RPMBaseCallback):
def progressbar(current, total, name=None):
@@@ -3430,6 -3428,6 +3474,4322 @@@
"""simple progress bar 50 # marks"""
mark = '#'
++diff --git a/po/cs.po b/po/cs.po
++index 622394b..8d79443 100644
++--- a/po/cs.po
+++++ b/po/cs.po
++@@ -2,14 +2,15 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Adam Pribyl <covex at lowlevel.cz>, 2011
+++# <zpavlas at redhat.com>, 2011.
+++# Adam Pribyl <covex at lowlevel.cz>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-08-12 20:48+0000\n"
+++"Last-Translator: MilanKerslager <milan.kerslager at pslib.cz>\n"
++ "Language-Team: Czech (http://www.transifex.net/projects/p/yum/team/cs/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -19,21 +20,21 @@ msgstr ""
++
++ #: ../callback.py:48 ../output.py:1037 ../yum/rpmtrans.py:73
++ msgid "Updating"
++-msgstr "Aktualizuje se"
+++msgstr "Aktualizace"
++
++ #: ../callback.py:49 ../yum/rpmtrans.py:74
++ msgid "Erasing"
++-msgstr "Maže se"
+++msgstr "Odstranění"
++
++ #: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:1036
++ #: ../output.py:2218 ../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
++ msgid "Obsoleted"
++-msgstr "Zastaralé"
+++msgstr "Zastaralo"
++
++ #: ../callback.py:54 ../output.py:1169 ../output.py:1686 ../output.py:1847
++ msgid "Updated"
++@@ -72,7 +73,7 @@ msgstr "Odstraňuje se"
++
++ #: ../callback.py:219 ../yum/rpmtrans.py:79
++ msgid "Cleanup"
++-msgstr "Čistí se"
+++msgstr "Vymazání"
++
++ #: ../cli.py:115
++ #, python-format
++@@ -81,11 +82,11 @@ msgstr "Příkaz „%s“ již definován"
++
++ #: ../cli.py:127
++ msgid "Setting up repositories"
++-msgstr "Nastavují se repozitáře"
+++msgstr "Příprava repozitářů"
++
++ #: ../cli.py:138
++ 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
++ #, python-format
++@@ -114,7 +115,7 @@ msgstr " Odesláno : %s na %s"
++
++ #: ../cli.py:336
++ 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
++ #, python-format
++@@ -150,15 +151,15 @@ msgstr "Ukončeno na příkaz uživatele"
++
++ #: ../cli.py:501
++ msgid "Downloading Packages:"
++-msgstr "Stahují se balíčky:"
+++msgstr "Stahování balíčků:"
++
++ #: ../cli.py:506
++ 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
++ msgid "Running Transaction Check"
++-msgstr ""
+++msgstr "Spuštěna kontrola transakce"
++
++ #: ../cli.py:534 ../yum/__init__.py:4976
++ msgid "ERROR You need to update rpm to handle:"
++@@ -166,32 +167,32 @@ msgstr "CHYBA Je potřeba aktualizovat rpm k provedení:"
++
++ #: ../cli.py:536 ../yum/__init__.py:4979
++ msgid "ERROR with transaction check vs depsolve:"
++-msgstr ""
+++msgstr "CHYBA při kontrole transakce a řešení závislostí:"
++
++ #: ../cli.py:542
++ msgid "RPM needs to be updated"
++-msgstr "Je potřeba aktualizovat RPM"
+++msgstr "Je nutné aktualizovat RPM"
++
++ #: ../cli.py:543
++ #, 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
++ msgid "Running Transaction Test"
++-msgstr "Spouští se test transakcí"
+++msgstr "Spuštěn test transakce"
++
++ #: ../cli.py:561
++ msgid "Transaction Check Error:\n"
++-msgstr "Chyba při kontrole transakcí:\n"
+++msgstr "Chyba při kontrole transakce:\n"
++
++ #: ../cli.py:568
++ msgid "Transaction Test Succeeded"
++-msgstr "Test transakcí uspěl"
+++msgstr "Test transakce v pořádku"
++
++ #: ../cli.py:600
++ msgid "Running Transaction"
++-msgstr "Spouští se transakce"
+++msgstr "Transakce spuštěna"
++
++ #: ../cli.py:630
++ msgid ""
++@@ -203,7 +204,7 @@ msgstr ""
++
++ #: ../cli.py:649 ../cli.py:692
++ msgid " * Maybe you meant: "
++-msgstr " * Možná jste myslel: "
+++msgstr " * Možná bylo míněno: "
++
++ #: ../cli.py:675 ../cli.py:683
++ #, python-format
++@@ -227,29 +228,29 @@ msgstr "Není co dělat"
++ #: ../cli.py:767
++ #, python-format
++ msgid "%d packages marked for Update"
++-msgstr "%d balíčků označeno k aktualizaci"
+++msgstr "%d balíčků k aktualizaci"
++
++ #: ../cli.py:770
++ 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
++ #, python-format
++ msgid "%d packages marked for Distribution Synchronization"
++-msgstr "%d balíčků označených k synchronizaci distribuce"
+++msgstr "%d balíčků určeno k synchronizaci distribuce"
++
++ #: ../cli.py:869
++ 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
++ #, python-format
++ msgid "%d packages marked for removal"
++-msgstr "%d balíčků označeno ke smazání"
+++msgstr "%d balíčků ke smazání"
++
++ #: ../cli.py:888
++ msgid "No Packages marked for removal"
++-msgstr "Žádné balíčky označené k odstranění"
+++msgstr "Žádné balíčky ke smazání"
++
++ #: ../cli.py:913
++ msgid "Package(s) to downgrade"
++@@ -263,7 +264,7 @@ msgstr " (z %s)"
++ #: ../cli.py:939
++ #, python-format
++ msgid "Installed package %s%s%s%s not available."
++-msgstr "Instalované balíčky %s%s%s%s nejsou dostupné"
+++msgstr "Instalované balíčky %s%s%s%s nejsou dostupné"
++
++ #: ../cli.py:947
++ msgid "Package(s) to reinstall"
++@@ -271,23 +272,27 @@ msgstr "Balíček(y) k reinstalaci"
++
++ #: ../cli.py:960
++ msgid "No Packages Provided"
++-msgstr "Žádný balíček neposkytuje"
+++msgstr "Neposkytnuty žádné balíčky"
++
++ #: ../cli.py:1058
++ #, python-format
++ msgid "N/S Matched: %s"
++-msgstr ""
+++msgstr "Jméno/Souhrn odpovídá: %s"
++
++ #: ../cli.py:1075
++ #, 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í."
++
++ #: ../cli.py:1077
++ #, 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í."
++
++ #: ../cli.py:1095
++ #, python-format
++@@ -297,12 +302,12 @@ msgstr "Shoda: %s"
++ #: ../cli.py:1102
++ #, 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
++ #, 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
++ msgid "No Matches found"
++@@ -315,44 +320,44 @@ msgstr "Nebyly nalezeny balíčky pro %s"
++
++ #: ../cli.py:1184
++ msgid "Cleaning repos: "
++-msgstr "Čištění repozitářů:"
+++msgstr "Vyčištění repozitářů:"
++
++ #: ../cli.py:1189
++ msgid "Cleaning up Everything"
++-msgstr "Čistí se vše"
+++msgstr "Vymazání celého obsahu cache"
++
++ #: ../cli.py:1205
++ msgid "Cleaning up Headers"
++-msgstr "Čistí se hlavičky"
+++msgstr "Vymazání hlaviček"
++
++ #: ../cli.py:1208
++ msgid "Cleaning up Packages"
++-msgstr "Čistí se balíčky"
+++msgstr "Vymazání balíčků"
++
++ #: ../cli.py:1211
++ msgid "Cleaning up xml metadata"
++-msgstr "Čistí se XML metadata"
+++msgstr "Vymazání XML metadat"
++
++ #: ../cli.py:1214
++ msgid "Cleaning up database cache"
++-msgstr "Čistí se skladiště databáze"
+++msgstr "Vymazání databázové cache"
++
++ #: ../cli.py:1217
++ msgid "Cleaning up expire-cache metadata"
++-msgstr "Ze skladiště se odstraňují zastaralá metadata"
+++msgstr "Vymazání zastaralých metadat"
++
++ #: ../cli.py:1220
++ msgid "Cleaning up cached rpmdb data"
++-msgstr "Čistí se skladiště rpmdb dat"
+++msgstr "Vymazání rpmdb cache"
++
++ #: ../cli.py:1223
++ msgid "Cleaning up plugins"
++-msgstr "Čistí se zásuvné moduly"
+++msgstr "Vymazání modulů"
++
++ #: ../cli.py:1247
++ #, python-format
++ msgid "Warning: No groups match: %s"
++-msgstr ""
+++msgstr "Varování: Žádná shoda skupiny pro: %s"
++
++ #: ../cli.py:1264
++ msgid "Installed Groups:"
++@@ -360,7 +365,7 @@ msgstr "Nainstalované skupiny:"
++
++ #: ../cli.py:1270
++ msgid "Installed Language Groups:"
++-msgstr ""
+++msgstr "Nainstalované jazykové skupiny:"
++
++ #: ../cli.py:1276
++ msgid "Available Groups:"
++@@ -368,7 +373,7 @@ msgstr "Dostupné skupiny:"
++
++ #: ../cli.py:1282
++ msgid "Available Language Groups:"
++-msgstr ""
+++msgstr "Dostupné jazykové skupiny:"
++
++ #: ../cli.py:1285
++ msgid "Done"
++@@ -411,7 +416,7 @@ msgstr "Balíček %s je již nainstalován, přeskakuje se"
++ #: ../cli.py:1397
++ #, python-format
++ msgid "Discarding non-comparable pkg %s.%s"
++-msgstr "Skartuje se neporovnatelný balíček %s.%s"
+++msgstr "Zahození neporovnatelného balíčku %s.%s"
++
++ #. we've not got any installed that match n or n+a
++ #: ../cli.py:1423
++@@ -421,12 +426,12 @@ msgstr "Žádný jiný %s nainstalován, přidán do seznamu k potenciální ins
++
++ #: ../cli.py:1443
++ msgid "Plugin Options"
++-msgstr "Možnosti zásuvného modulu"
+++msgstr "Volby zásuvného modulu"
++
++ #: ../cli.py:1451
++ #, python-format
++ msgid "Command line error: %s"
++-msgstr "Chyba příkazové řádky: %s"
+++msgstr "Chyba na příkazovém řádku: %s"
++
++ #: ../cli.py:1467
++ #, python-format
++@@ -441,13 +446,13 @@ msgstr ""
++
++ #: ../cli.py:1521
++ 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
++ #, python-format
++ msgid "--installroot must be an absolute path: %s"
++-msgstr ""
+++msgstr "--installroot musí být absolutní cesta: %s"
++
++ #: ../cli.py:1642
++ msgid "show this help message and exit"
++@@ -459,7 +464,7 @@ msgstr "tolerovat chyby"
++
++ #: ../cli.py:1649
++ 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
++ msgid "config file location"
++@@ -471,7 +476,7 @@ msgstr "maximální čas čekání na příkaz"
++
++ #: ../cli.py:1657
++ msgid "debugging output level"
++-msgstr "úroveň výstupních ladících informací"
+++msgstr "úroveň výpisu ladících informací"
++
++ #: ../cli.py:1661
++ msgid "show duplicates, in repos, in list/search commands"
++@@ -479,23 +484,23 @@ msgstr "ukázat duplikáty v repozitářích, v list/search příkazech"
++
++ #: ../cli.py:1663
++ msgid "error output level"
++-msgstr "úroveň výstupu chyb"
+++msgstr "úroveň výpisu chyb"
++
++ #: ../cli.py:1666
++ 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
++ msgid "quiet operation"
++-msgstr "tichý chod"
+++msgstr "tichý běh"
++
++ #: ../cli.py:1671
++ msgid "verbose operation"
++-msgstr "užvaněný chod"
+++msgstr "užvaněný běh"
++
++ #: ../cli.py:1673
++ 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:1675
++ msgid "show Yum version and exit"
++@@ -515,7 +520,7 @@ msgstr "zakázat jeden nebo více repozitářů (zástupné znaky povoleny)"
++
++ #: ../cli.py:1687
++ 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
++ msgid "disable exclude from main, for a repo or for everything"
++@@ -551,7 +556,7 @@ msgstr "kontrola zda jsou použity barvy"
++
++ #: ../cli.py:1708
++ 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
++ msgid "set arbitrary config and repo options"
++@@ -559,110 +564,110 @@ msgstr "nastavit doplňkové konfigurace a možnosti repozitáře "
++
++ #: ../output.py:307
++ msgid "Jan"
++-msgstr "Led"
+++msgstr "led"
++
++ #: ../output.py:307
++ msgid "Feb"
++-msgstr "Úno"
+++msgstr "úno"
++
++ #: ../output.py:307
++ msgid "Mar"
++-msgstr "Bře"
+++msgstr "bře"
++
++ #: ../output.py:307
++ msgid "Apr"
++-msgstr "Dub"
+++msgstr "dub"
++
++ #: ../output.py:307
++ msgid "May"
++-msgstr "Kvě"
+++msgstr "kvě"
++
++ #: ../output.py:307
++ msgid "Jun"
++-msgstr "Čer"
+++msgstr "čer"
++
++ #: ../output.py:308
++ msgid "Jul"
++-msgstr "Čec"
+++msgstr "čec"
++
++ #: ../output.py:308
++ msgid "Aug"
++-msgstr "Srp"
+++msgstr "srp"
++
++ #: ../output.py:308
++ msgid "Sep"
++-msgstr "Zář"
+++msgstr "zář"
++
++ #: ../output.py:308
++ msgid "Oct"
++-msgstr "Říj"
+++msgstr "říj"
++
++ #: ../output.py:308
++ msgid "Nov"
++-msgstr "Lis"
+++msgstr "lis"
++
++ #: ../output.py:308
++ msgid "Dec"
++-msgstr "Pro"
+++msgstr "pro"
++
++ #: ../output.py:318
++ msgid "Trying other mirror."
++-msgstr "Zkouší se jiné zrcadlo"
+++msgstr "Zkusí se jiné zrcadlo..."
++
++ #: ../output.py:581
++ #, python-format
++ msgid "Name : %s%s%s"
++-msgstr "Jméno : %s%s%s"
+++msgstr "Jméno : %s%s%s"
++
++ #: ../output.py:582
++ #, python-format
++ msgid "Arch : %s"
++-msgstr "Arch : %s"
+++msgstr "Platforma : %s"
++
++ #: ../output.py:584
++ #, python-format
++ msgid "Epoch : %s"
++-msgstr "Epocha : %s"
+++msgstr "Epocha : %s"
++
++ #: ../output.py:585
++ #, python-format
++ msgid "Version : %s"
++-msgstr "Verze : %s"
+++msgstr "Verze : %s"
++
++ #: ../output.py:586
++ #, python-format
++ msgid "Release : %s"
++-msgstr "Vydání : %s"
+++msgstr "Vydání : %s"
++
++ #: ../output.py:587
++ #, python-format
++ msgid "Size : %s"
++-msgstr "Velikost : %s"
+++msgstr "Velikost : %s"
++
++ #: ../output.py:588 ../output.py:900
++ #, python-format
++ msgid "Repo : %s"
++-msgstr "Repo : %s"
+++msgstr "Repozitář : %s"
++
++ #: ../output.py:590
++ #, python-format
++ msgid "From repo : %s"
++-msgstr "Z repozitáře: %s"
+++msgstr "Z repozitáře : %s"
++
++ #: ../output.py:592
++ #, python-format
++ msgid "Committer : %s"
++-msgstr "Odesilatel : %s"
+++msgstr "Odesilatel : %s"
++
++ #: ../output.py:593
++ #, python-format
++ msgid "Committime : %s"
++-msgstr "Čas odeslání: %s"
+++msgstr "Čas odeslání : %s"
++
++ #: ../output.py:594
++ #, python-format
++ msgid "Buildtime : %s"
++-msgstr "Čas sestavení: %s"
+++msgstr "Čas vytvoření: %s"
++
++ #: ../output.py:596
++ #, python-format
++@@ -672,29 +677,29 @@ msgstr "Čas instalace: %s "
++ #: ../output.py:604
++ #, python-format
++ msgid "Installed by: %s"
++-msgstr "Nainstaloval: %s "
+++msgstr "Nainstaloval : %s "
++
++ #: ../output.py:611
++ #, python-format
++ msgid "Changed by : %s"
++-msgstr "Změnil : %s"
+++msgstr "Změnil : %s"
++
++ #: ../output.py:612
++ msgid "Summary : "
++-msgstr "Souhrn : "
+++msgstr "Souhrn : "
++
++ #: ../output.py:614 ../output.py:913
++ #, python-format
++ msgid "URL : %s"
++-msgstr "URL : %s"
+++msgstr "URL : %s"
++
++ #: ../output.py:615
++ msgid "License : "
++-msgstr "Licence : "
+++msgstr "Licence : "
++
++ #: ../output.py:616 ../output.py:910
++ msgid "Description : "
++-msgstr "Popis : "
+++msgstr "Popis : "
++
++ #: ../output.py:684
++ msgid "y"
++@@ -738,7 +743,7 @@ msgstr " Popis: %s"
++ #: ../output.py:788
++ #, python-format
++ msgid " Language: %s"
++-msgstr ""
+++msgstr " Jazyk: %s"
++
++ #: ../output.py:790
++ msgid " Mandatory Packages:"
++@@ -759,20 +764,20 @@ msgstr " Podmínečné balíčky:"
++ #: ../output.py:814
++ #, python-format
++ msgid "package: %s"
++-msgstr "balíčky: %s"
+++msgstr "balíček: %s"
++
++ #: ../output.py:816
++ 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
++ #, python-format
++ msgid " dependency: %s"
++-msgstr " závislosti: %s"
+++msgstr " závislost: %s"
++
++ #: ../output.py:823
++ msgid " Unsatisfied dependency"
++-msgstr " Neuspokojené závislosti"
+++msgstr " Nevyřešené závislosti"
++
++ #: ../output.py:901
++ msgid "Matched from:"
++@@ -794,7 +799,7 @@ msgstr "Další : "
++
++ #: ../output.py:966
++ 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
++ #, python-format
++@@ -804,7 +809,7 @@ msgstr "Celková velikost: %s"
++ #: ../output.py:974
++ #, 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
++ #, python-format
++@@ -813,27 +818,27 @@ msgstr "Nainstalovaná velikost: %s"
++
++ #: ../output.py:994
++ 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
++ msgid "Reinstalling"
++-msgstr "Přeinstalovává se"
+++msgstr "Reinstalace"
++
++ #: ../output.py:1040
++ msgid "Downgrading"
++-msgstr "Snižuje se verze"
+++msgstr "Snížení verze"
++
++ #: ../output.py:1041
++ msgid "Installing for dependencies"
++-msgstr "Instaluje se kvůli závislostem"
+++msgstr "Instalace kvůli závislostem"
++
++ #: ../output.py:1042
++ msgid "Updating for dependencies"
++-msgstr "Aktualizuje se kvůli závislostem"
+++msgstr "Aktualizace se kvůli závislostem"
++
++ #: ../output.py:1043
++ 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
++ msgid "Skipped (dependency problems)"
++@@ -845,7 +850,7 @@ msgstr "Nenainstalováno"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Nedostupný"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -935,7 +940,7 @@ msgstr "Selhalo"
++ #. Delta between C-c's so we treat as exit
++ #: ../output.py:1260
++ msgid "two"
++-msgstr "dvě"
+++msgstr "dvou"
++
++ #. For translators: This is output like:
++ #. Current download cancelled, interrupt (ctrl-c) again within two seconds
++@@ -995,11 +1000,11 @@ msgstr "Systém"
++ #: ../output.py:1411
++ #, 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
++ msgid "No transactions"
++-msgstr ""
+++msgstr "Žádné transakce"
++
++ #: ../output.py:1446 ../output.py:2013
++ msgid "Bad transaction IDs, or package(s), given"
++@@ -1007,11 +1012,11 @@ msgstr "Zadáno špatné ID transakce nebo balíčku/ů"
++
++ #: ../output.py:1484
++ msgid "Command line"
++-msgstr ""
+++msgstr "Příkazový řádek"
++
++ #: ../output.py:1486 ../output.py:1908
++ 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
++@@ -1077,26 +1082,26 @@ msgstr "Začátek rpmdb :"
++ #: ../output.py:1749
++ #, python-format
++ msgid "(%u seconds)"
++-msgstr ""
+++msgstr "(%u sekund)"
++
++ #: ../output.py:1751
++ #, python-format
++ msgid "(%u minutes)"
++-msgstr ""
+++msgstr "(%u minut)"
++
++ #: ../output.py:1753
++ #, python-format
++ msgid "(%u hours)"
++-msgstr ""
+++msgstr "(%u hodin)"
++
++ #: ../output.py:1755
++ #, python-format
++ msgid "(%u days)"
++-msgstr ""
+++msgstr "(%u dnů)"
++
++ #: ../output.py:1756
++ msgid "End time :"
++-msgstr "Konečný čas :"
+++msgstr "Čas ukončení :"
++
++ #: ../output.py:1759 ../output.py:1761
++ msgid "End rpmdb :"
++@@ -1117,7 +1122,7 @@ msgstr "Přerušeno"
++
++ #: ../output.py:1773
++ msgid "Failures:"
++-msgstr ""
+++msgstr "Selhání:"
++
++ #: ../output.py:1777
++ msgid "Failure:"
++@@ -1125,11 +1130,11 @@ msgstr "Selhalo:"
++
++ #: ../output.py:1779
++ msgid "Success"
++-msgstr "Úspěch"
+++msgstr "Úspěšné"
++
++ #: ../output.py:1784 ../output.py:1786
++ msgid "Command Line :"
++-msgstr "Příkazová řádka:"
+++msgstr "Příkazový řádek:"
++
++ #: ../output.py:1795
++ #, python-format
++@@ -1242,48 +1247,48 @@ msgstr "%s: Nenalezena další data toho jména"
++
++ #: ../output.py:2106
++ msgid "installed"
++-msgstr "instalaci"
+++msgstr "instalován"
++
++ #: ../output.py:2107
++ msgid "an update"
++-msgstr ""
+++msgstr "novou aktualizací"
++
++ #: ../output.py:2108
++ msgid "erased"
++-msgstr "smazání"
+++msgstr "smazán"
++
++ #: ../output.py:2109
++ msgid "reinstalled"
++-msgstr "reinstalaci"
+++msgstr "reinstalován"
++
++ #: ../output.py:2110
++ msgid "a downgrade"
++-msgstr ""
+++msgstr "ponížen"
++
++ #: ../output.py:2111
++ msgid "obsoleting"
++-msgstr ""
+++msgstr "nahrazen"
++
++ #: ../output.py:2112
++ msgid "updated"
++-msgstr "aktualizaci"
+++msgstr "aktualizován"
++
++ #: ../output.py:2113
++ msgid "obsoleted"
++-msgstr "zastarání"
+++msgstr "zastaralý"
++
++ #: ../output.py:2117
++ #, 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
++ msgid "--> Running transaction check"
++-msgstr "--> Spouští se kontrola transakce"
+++msgstr "--> Kontrola transakce spuštěna"
++
++ #: ../output.py:2129
++ 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
++ msgid "--> Finished Dependency Resolution"
++@@ -1292,17 +1297,17 @@ msgstr "--> Řešení závislostí dokončeno"
++ #: ../output.py:2139 ../output.py:2144
++ #, 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
++ #, python-format
++ msgid "---> Keeping package: %s"
++-msgstr "---> Ponechají se balíčky: %s"
+++msgstr "---> Ponechíní balíčku: %s"
++
++ #: ../output.py:2152
++ #, python-format
++ msgid "--> Unresolved Dependency: %s"
++-msgstr "--> Nevyřešená závislost: %s"
+++msgstr "--> Nevyřešené závislosti: %s"
++
++ #: ../output.py:2163
++ #, python-format
++@@ -1347,7 +1352,7 @@ msgstr ""
++ #. These should be the only three things we care about:
++ #: ../output.py:2196
++ msgid "Updated By"
++-msgstr "Aktualizoval"
+++msgstr "Aktualizací balíčku"
++
++ #: ../output.py:2197
++ msgid "Downgraded By"
++@@ -1355,7 +1360,7 @@ msgstr "Snížil verzi"
++
++ #: ../output.py:2198
++ msgid "Obsoleted By"
++-msgstr "Zastaral"
+++msgstr "Zastaralán"
++
++ #: ../output.py:2216
++ msgid "Available"
++@@ -1368,12 +1373,12 @@ msgstr "--> Zpracování konfliktu: %s je v konfliktu s %s"
++
++ #: ../output.py:2252
++ 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
++ #, 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
++ msgid "Running"
++@@ -1416,7 +1421,7 @@ msgstr " Paměť : %5s RSS (%5sB VSZ)"
++ #: ../utils.py:125
++ #, python-format
++ msgid " Started: %s - %s ago"
++-msgstr " Spuštěn: %s - %s nazpět"
+++msgstr " Spuštěn: %s - před %s"
++
++ #: ../utils.py:127
++ #, python-format
++@@ -1431,7 +1436,7 @@ msgid ""
++ msgstr ""
++ "\n"
++ "\n"
++-"Ukončeno na základě pokynu uživatele"
+++"Ukončeno na příkaz uživatele"
++
++ #: ../utils.py:176 ../yummain.py:49
++ msgid ""
++@@ -1441,7 +1446,7 @@ msgid ""
++ msgstr ""
++ "\n"
++ "\n"
++-"Ukončeno kvůli nefunkční rouře"
+++"Ukončeno přerušením roury"
++
++ #: ../utils.py:178 ../yummain.py:51
++ #, python-format
++@@ -1459,7 +1464,7 @@ msgid ""
++ "Another app is currently holding the yum lock; exiting as configured by "
++ "exit_on_lock"
++ 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"
++
++ #: ../utils.py:287
++@@ -1479,7 +1484,7 @@ msgstr "Chyba: %s"
++
++ #: ../utils.py:346 ../yummain.py:194
++ msgid " You could try using --skip-broken to work around the problem"
++-msgstr " Můžete zkusit volbu --skip-broken k překonání tohoto problému"
+++msgstr " Pro obejití problému můžete zkusit volbu --skip-broken"
++
++ #: ../utils.py:348 ../yummain.py:87
++ msgid " You could try running: rpm -Va --nofiles --nodigest"
++@@ -1496,7 +1501,7 @@ msgid ""
++ "Dependencies Resolved"
++ msgstr ""
++ "\n"
++-"Závislosti vyřešeny"
+++"Závislosti vyřešeny."
++
++ #: ../utils.py:376 ../yummain.py:234
++ msgid "Complete!"
++@@ -1504,11 +1509,11 @@ msgstr "Hotovo!"
++
++ #: ../yumcommands.py:42
++ msgid " Mini usage:\n"
++-msgstr ""
+++msgstr " Mini použití:\n"
++
++ #: ../yumcommands.py:52
++ msgid "You need to be root to perform this command."
++-msgstr "Pro spuštění tohoto příkazu potřebujete být root."
+++msgstr "Tento příkaz může spustit jen root."
++
++ #: ../yumcommands.py:59
++ msgid ""
++@@ -1527,9 +1532,9 @@ msgid ""
++ "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"
++@@ -1542,7 +1547,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Problém v repozitáři: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1551,7 +1556,7 @@ msgstr "Chyba: Je potřeba předat seznam balíčků do %s"
++
++ #: ../yumcommands.py:86
++ msgid "Error: Need an item to match"
++-msgstr "Chyba: K nalezení shody je potřeba předmět"
+++msgstr "Chyba: K nalezení shody je potřeba položka"
++
++ #: ../yumcommands.py:92
++ msgid "Error: Need a group or list of groups"
++@@ -1569,7 +1574,7 @@ msgstr "Chyba: Neplatný argument pro clean: %r"
++
++ #: ../yumcommands.py:119
++ msgid "No argument to shell"
++-msgstr "Shell nemá žádný argument"
+++msgstr "Žádný argument pro shell"
++
++ #: ../yumcommands.py:121
++ #, python-format
++@@ -1591,9 +1596,9 @@ msgid ""
++ " Run \"yum repolist all\" to see the repos you have.\n"
++ " You can enable repos with yum-config-manager --enable <repo>"
++ 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 <repo>\""
+++"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 <repo>\""
++
++ #: ../yumcommands.py:200
++ msgid "PACKAGE..."
++@@ -1605,7 +1610,7 @@ msgstr "Instalovat balíček nebo balíčky do vašeho systému"
++
++ #: ../yumcommands.py:212
++ msgid "Setting up Install Process"
++-msgstr "Uspořádává se průběh instalace"
+++msgstr "Příprava průběhu instalace"
++
++ #: ../yumcommands.py:223 ../yumcommands.py:245
++ msgid "[PACKAGE...]"
++@@ -1613,11 +1618,11 @@ msgstr "[Balíček...]"
++
++ #: ../yumcommands.py:226
++ msgid "Update a package or packages on your system"
++-msgstr "Aktualizovat balíček nebo balíčky na vašem systému"
+++msgstr "Aktualizovat balíček nebo balíčky v systému"
++
++ #: ../yumcommands.py:234
++ msgid "Setting up Update Process"
++-msgstr "Uspořádává se průběh aktualizace"
+++msgstr "Příprava průběhu aktualizace"
++
++ #: ../yumcommands.py:248
++ msgid "Synchronize installed packages to the latest available versions"
++@@ -1625,7 +1630,7 @@ msgstr "Synchronizovat nainstalované balíčky na poslední dostupnou verzi"
++
++ #: ../yumcommands.py:256
++ msgid "Setting up Distribution Synchronization Process"
++-msgstr "Uspořádává se proces synchronizace distribuce"
+++msgstr "Příprava procesu synchronizace distribuce"
++
++ #: ../yumcommands.py:299
++ msgid "Display details about a package or group of packages"
++@@ -1633,32 +1638,32 @@ msgstr "Zobrazit detaily o balíčku nebo skupině balíčků"
++
++ #: ../yumcommands.py:348
++ msgid "Installed Packages"
++-msgstr "Nainstalované balíčky"
+++msgstr "Nainstalované balíčky:"
++
++ #: ../yumcommands.py:356
++ msgid "Available Packages"
++-msgstr "Dostupné balíčky"
+++msgstr "Dostupné balíčky:"
++
++ #: ../yumcommands.py:360
++ msgid "Extra Packages"
++-msgstr "Dodatečné balíčky"
+++msgstr "Dodatečné balíčky:"
++
++ #: ../yumcommands.py:364
++ msgid "Updated Packages"
++-msgstr "Aktualizované balíčky"
+++msgstr "Aktualizované balíčky:"
++
++ #. This only happens in verbose mode
++ #: ../yumcommands.py:372 ../yumcommands.py:379 ../yumcommands.py:667
++ msgid "Obsoleting Packages"
++-msgstr "Zastaralé balíčky"
+++msgstr "Zastaralé balíčky:"
++
++ #: ../yumcommands.py:381
++ msgid "Recently Added Packages"
++-msgstr "Nově přidané balíčky"
+++msgstr "Nedávno přidané balíčky:"
++
++ #: ../yumcommands.py:388
++ msgid "No matching Packages to list"
++-msgstr "Nenalezeny shodné balíčky"
+++msgstr "Nenalezeny odpovídající balíčky"
++
++ #: ../yumcommands.py:402
++ msgid "List a package or groups of packages"
++@@ -1670,11 +1675,11 @@ msgstr "Odstranit balíček nebo balíčky ze systému"
++
++ #: ../yumcommands.py:421
++ 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
++ msgid "Setting up Group Process"
++-msgstr "Uspořádává se zpracování skupiny"
+++msgstr "Příprava zpracování skupiny"
++
++ #: ../yumcommands.py:441
++ msgid "No Groups on which to run command"
++@@ -1698,23 +1703,23 @@ msgstr "Zobrazit detaily o skupině balíčků"
++
++ #: ../yumcommands.py:550
++ msgid "Generate the metadata cache"
++-msgstr "Vygenerovat skladiště metadat"
+++msgstr "Vygenerovat cache s metadaty"
++
++ #: ../yumcommands.py:556
++ msgid "Making cache files for all metadata files."
++-msgstr "Vytváří se skladištní soubory pro všechna metadata "
+++msgstr "Vytváření cache souborů pro všechna metadata."
++
++ #: ../yumcommands.py:557
++ msgid "This may take a while depending on the speed of this computer"
++-msgstr "Může to chvíli trvat v závislosti na rychlosti tohoto počítače"
+++msgstr "Může to chvíli trvat v závislosti na rychlosti počítače"
++
++ #: ../yumcommands.py:578
++ msgid "Metadata Cache Created"
++-msgstr "Skladiště metadat vytvořeno"
+++msgstr "Cache s metadaty vytvořena."
++
++ #: ../yumcommands.py:592
++ msgid "Remove cached data"
++-msgstr "Odstranit data ze skladiště"
+++msgstr "Odstranit data z cache"
++
++ #: ../yumcommands.py:613
++ msgid "Find what package provides the given value"
++@@ -1722,15 +1727,15 @@ msgstr "Nalézt balíček, který poskytuje danou hodnotu"
++
++ #: ../yumcommands.py:633
++ msgid "Check for available package updates"
++-msgstr "Zkontrolovat dostupné aktualizace balíčků"
+++msgstr "Zkontrolovat dostupnost aktualizací pro balíčky"
++
++ #: ../yumcommands.py:687
++ msgid "Search package details for the given string"
++-msgstr "Nalézt detaily balíčku pro daný řetězec"
+++msgstr "Vyhledat detaily balíčku pro zadaný řetězec"
++
++ #: ../yumcommands.py:693
++ msgid "Searching Packages: "
++-msgstr "Prohledávají se balíčky: "
+++msgstr "Prohledávání balíčků: "
++
++ #: ../yumcommands.py:710
++ msgid "Update packages taking obsoletes into account"
++@@ -1738,7 +1743,7 @@ msgstr "Aktualizovat balíčky a brát v úvahu zastaralé"
++
++ #: ../yumcommands.py:719
++ msgid "Setting up Upgrade Process"
++-msgstr "Uspořádává se průběh aktualizace"
+++msgstr "Příprava průběhu upgrade"
++
++ #: ../yumcommands.py:737
++ msgid "Install a local RPM"
++@@ -1746,15 +1751,15 @@ msgstr "Instalovat lokální RPM"
++
++ #: ../yumcommands.py:745
++ 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 "Zjistit, který balíček poskytuje danou závislost"
++
++ #: ../yumcommands.py:767
++ msgid "Searching Packages for Dependency:"
++-msgstr "Prohledávají se balíčky kvůli závislostem:"
+++msgstr "Prohledávání balíčků pro vyřešení závislostí:"
++
++ #: ../yumcommands.py:781
++ msgid "Run an interactive yum shell"
++@@ -1762,15 +1767,15 @@ msgstr "Spustit interaktivní shell yum"
++
++ #: ../yumcommands.py:787
++ msgid "Setting up Yum Shell"
++-msgstr "Nastavuje se yum shell"
+++msgstr "Příprava yum shellu"
++
++ #: ../yumcommands.py:805
++ msgid "List a package's dependencies"
++-msgstr "Zobrazit závislosti balíčku"
+++msgstr "Vypsat závislosti balíčku"
++
++ #: ../yumcommands.py:811
++ msgid "Finding dependencies: "
++-msgstr "Hledají se závislosti: "
+++msgstr "Hledání závislostí: "
++
++ #: ../yumcommands.py:827
++ msgid "Display the configured software repositories"
++@@ -1786,11 +1791,11 @@ msgstr "zakázáno"
++
++ #: ../yumcommands.py:937
++ msgid "Repo-id : "
++-msgstr "Repo-id : "
+++msgstr "Repo-ID : "
++
++ #: ../yumcommands.py:938
++ msgid "Repo-name : "
++-msgstr "Repo-jméno : "
+++msgstr "Repo-název : "
++
++ #: ../yumcommands.py:941
++ msgid "Repo-status : "
++@@ -1810,11 +1815,11 @@ msgstr "Repo-distro-tagy: "
++
++ #: ../yumcommands.py:959
++ msgid "Repo-updated : "
++-msgstr "Repo-aktuální: "
+++msgstr "Repo-aktual. : "
++
++ #: ../yumcommands.py:961
++ msgid "Repo-pkgs : "
++-msgstr "Repo-bal. : "
+++msgstr "Repo-balíčků : "
++
++ #: ../yumcommands.py:962
++ msgid "Repo-size : "
++@@ -1830,7 +1835,7 @@ msgstr "Repo-metalink: "
++
++ #: ../yumcommands.py:981
++ msgid " Updated : "
++-msgstr " Aktualizováno: "
+++msgstr "Aktualizováno: "
++
++ #: ../yumcommands.py:984
++ msgid "Repo-mirrors : "
++@@ -1869,21 +1874,21 @@ msgstr "Repo-vyřazeno: "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Repo-konfig : "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++ #: ../yumcommands.py:1032 ../yumcommands.py:1061
++ msgid "repo id"
++-msgstr "repo id"
+++msgstr "ID repozitáře:"
++
++ #: ../yumcommands.py:1049 ../yumcommands.py:1050 ../yumcommands.py:1068
++ msgid "status"
++-msgstr "status"
+++msgstr "Stav:"
++
++ #: ../yumcommands.py:1062
++ msgid "repo name"
++-msgstr "jméno repa"
+++msgstr "Název repozitáře:"
++
++ #: ../yumcommands.py:1099
++ msgid "Display a helpful usage message"
++@@ -1892,7 +1897,7 @@ msgstr "Zobrazit užitečnou nápovědu"
++ #: ../yumcommands.py:1133
++ #, 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
++ msgid ""
++@@ -1916,7 +1921,7 @@ msgstr ""
++
++ #: ../yumcommands.py:1168
++ msgid "Setting up Reinstall Process"
++-msgstr "Uspořádává se průběh reinstalace"
+++msgstr "Příprava průběhu reinstalace"
++
++ #: ../yumcommands.py:1176
++ msgid "reinstall a package"
++@@ -1924,7 +1929,7 @@ msgstr "Reinstalace balíčku"
++
++ #: ../yumcommands.py:1195
++ 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
++ msgid "downgrade a package"
++@@ -1932,7 +1937,7 @@ msgstr "Snížení verze balíčku"
++
++ #: ../yumcommands.py:1216
++ 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
++ msgid " Yum version groups:"
++@@ -1964,12 +1969,12 @@ msgstr "Dostupné skupiny:"
++
++ #: ../yumcommands.py:1360
++ msgid "Display, or use, the transaction history"
++-msgstr "Zobrazit nebo používat transakční historii"
+++msgstr "Zobrazit nebo používat historii transakcí"
++
++ #: ../yumcommands.py:1432
++ #, 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
++ msgid "You don't have access to the history DB."
++@@ -1981,46 +1986,46 @@ msgstr "Zkontrolovat problémy v rpmdb"
++
++ #: ../yumcommands.py:1514
++ msgid "load a saved transaction from filename"
++-msgstr ""
+++msgstr "Načíst transakci uloženou v souboru"
++
++ #: ../yumcommands.py:1518
++ msgid "No saved transaction file specified."
++-msgstr ""
+++msgstr "Nebyla zadána žádná uložená transakce."
++
++ #: ../yumcommands.py:1522
++ #, python-format
++ msgid "loading transaction from %s"
++-msgstr ""
+++msgstr "načítání transakce z %s"
++
++ #: ../yumcommands.py:1528
++ #, python-format
++ msgid "Transaction loaded from %s with %s members"
++-msgstr ""
+++msgstr "Transakce načtena z %s s %s položkami"
++
++ #. This is mainly for PackageSackError from rpmdb.
++ #: ../yummain.py:84
++ #, python-format
++ msgid " Yum checks failed: %s"
++-msgstr ""
+++msgstr " Selhaly kontroly Yumu: %s"
++
++ #: ../yummain.py:114
++ msgid ""
++ "Another app is currently holding the yum lock; waiting for it to exit..."
++-msgstr "Zámek yumu je obsazen jinou aplikací; čeká se na její ukončení..."
+++msgstr "Zámek yumu drží jiná aplikace; čeká se na její ukončení..."
++
++ #: ../yummain.py:120
++ msgid "Can't create lock file; exiting"
++-msgstr ""
+++msgstr "Nelze vytvořit soubor se zámkem; končím"
++
++ #. Depsolve stage
++ #: ../yummain.py:167
++ msgid "Resolving Dependencies"
++-msgstr "Řeší se závislosti"
+++msgstr "Řešení závislostí..."
++
++ #: ../yummain.py:230
++ #, python-format
++ msgid "Your transaction was saved, rerun it with: yum load-transaction %s"
++-msgstr ""
+++msgstr "Transakce byla uložena, spustíte ji pomocí: yum load-transaction %s"
++
++ #: ../yummain.py:288
++ msgid ""
++@@ -2038,8 +2043,7 @@ msgstr "doTsSetup() bude v následujících verzích yumu odstraněno.\n"
++
++ #: ../yum/depsolve.py:99
++ 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
++ #, python-format
++@@ -2049,27 +2053,27 @@ msgstr "Neplatný tsflag v konfiguračním souboru: %s"
++ #: ../yum/depsolve.py:164
++ #, 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
++ #, python-format
++ msgid "Member: %s"
++-msgstr "Prvek: %s"
+++msgstr "Člen: %s"
++
++ #: ../yum/depsolve.py:221 ../yum/depsolve.py:793
++ #, python-format
++ msgid "%s converted to install"
++-msgstr "%s zkonvertován na instalaci"
+++msgstr "%s zkonvertován pro instalaci"
++
++ #: ../yum/depsolve.py:233
++ #, 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
++ #, python-format
++ msgid "Removing Package %s"
++-msgstr "Odstraňuje se balíček %s"
+++msgstr "Odstranění balíčku %s"
++
++ #: ../yum/depsolve.py:271
++ #, python-format
++@@ -2083,12 +2087,12 @@ msgstr "%s vyžaduje %s"
++
++ #: ../yum/depsolve.py:339
++ 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
++ #, 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
++ #, python-format
++@@ -2098,12 +2102,12 @@ msgstr "Možný poskytovatel: %s"
++ #: ../yum/depsolve.py:380
++ #, 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
++ #, python-format
++ msgid "Mode for pkg providing %s: %s"
++-msgstr "Mód pro bal. poskytující %s: %s"
+++msgstr "Režim pro bal. poskytující %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
++@@ -2111,37 +2115,39 @@ msgstr "Mód pro bal. poskytující %s: %s"
++ #: ../yum/depsolve.py:389 ../yum/depsolve.py:406
++ #, 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
++ #, python-format
++ msgid "No update paths found for %s. Failure!"
++-msgstr ""
+++msgstr "Není cesta pro aktualizaci %s. Selhání!"
++
++ #: ../yum/depsolve.py:416
++ #, 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
++ #, 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í."
++
++ #: ../yum/depsolve.py:432
++ #, 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
++ #, 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
++ #, python-format
++ msgid "Quick matched %s to require for %s"
++-msgstr "Rychlá shoda %s vyžadovaného pro %s"
+++msgstr "Rychlá shoda %s vyžadována pro %s"
++
++ #. is it already installed?
++ #: ../yum/depsolve.py:513
++@@ -2153,27 +2159,27 @@ msgstr ""
++ #: ../yum/depsolve.py:529
++ #, 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
++ #, 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
++ #, 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
++ #, 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
++ #, 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
++ msgid "Success - empty transaction"
++@@ -2181,11 +2187,11 @@ msgstr "Úspěch - prázdná transakce"
++
++ #: ../yum/depsolve.py:767 ../yum/depsolve.py:783
++ msgid "Restarting Loop"
++-msgstr "Restartuje se smyčka"
+++msgstr "Restartování smyčky"
++
++ #: ../yum/depsolve.py:799
++ msgid "Dependency Process ending"
++-msgstr "Proces zpracování závislostí končí"
+++msgstr "Proces zpracování závislostí skončil"
++
++ #: ../yum/depsolve.py:821
++ msgid "Success - deps resolved"
++@@ -2194,17 +2200,17 @@ msgstr "Úspěch - závislosti vyřešeny"
++ #: ../yum/depsolve.py:845
++ #, python-format
++ msgid "Checking deps for %s"
++-msgstr "Kontroluji závislosti pro %s"
+++msgstr "Kontrola závislostí pro %s"
++
++ #: ../yum/depsolve.py:931
++ #, 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
++ #, 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
++ #, python-format
++@@ -2222,7 +2228,7 @@ msgid ""
++ "archdist compared %s to %s on %s\n"
++ " Winner: %s"
++ msgstr ""
++-"archdist porovnán pro %s k %s na %s\n"
+++"archdist porovnal %s vůči %s na %s\n"
++ " Vítěz: %s"
++
++ #: ../yum/depsolve.py:1318
++@@ -2253,12 +2259,12 @@ msgstr " Vítěz: %s"
++ #: ../yum/depsolve.py:1368
++ #, python-format
++ msgid " Loser(with %d): %s"
++-msgstr " Poražený (kým %d): %s"
+++msgstr " Poražený (%d): %s"
++
++ #: ../yum/depsolve.py:1384
++ #, python-format
++ msgid "Best Order: %s"
++-msgstr "Nejlepší pořádek: %s"
+++msgstr "Nejlepší pořadí: %s"
++
++ #: ../yum/__init__.py:234
++ msgid "doConfigSetup() will go away in a future version of Yum.\n"
++@@ -2267,16 +2273,16 @@ msgstr "doConfigSetup() bude odstraněn v příští verzi Yumu.\n"
++ #: ../yum/__init__.py:482
++ #, python-format
++ msgid "Repository %r: Error parsing config: %s"
++-msgstr "Repozitář %r: Chyba při zpracování konfigurace: %s"
+++msgstr "Repozitář %r: Chyba při parsování konfigurace: %s"
++
++ #: ../yum/__init__.py:488
++ #, python-format
++ msgid "Repository %r is missing name in configuration, using id"
++-msgstr "Repozitáři %r chybí jméno v konfiguraci, používá se id"
+++msgstr "Repozitáři %r chybí v konfiguraci jméno, použito id"
++
++ #: ../yum/__init__.py:526
++ msgid "plugins already initialised"
++-msgstr "zásuvný modul je již inicializován"
+++msgstr "zásuvné moduly jsou již inicializovány"
++
++ #: ../yum/__init__.py:533
++ msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
++@@ -2284,7 +2290,7 @@ msgstr "doRpmDBSetup() bude odstraněn v příští verzi Yumu.\n"
++
++ #: ../yum/__init__.py:544
++ msgid "Reading Local RPMDB"
++-msgstr "Načítá se lokální RPMDB"
+++msgstr "Načítání lokální RPMDB"
++
++ #: ../yum/__init__.py:567
++ msgid "doRepoSetup() will go away in a future version of Yum.\n"
++@@ -2296,16 +2302,16 @@ msgstr "doSackSetup() bude odstraněn v příští verzi Yumu.\n"
++
++ #: ../yum/__init__.py:660
++ msgid "Setting up Package Sacks"
++-msgstr "Připravuje se pytel balíčků"
+++msgstr "Příprava souhrnu balíčků"
++
++ #: ../yum/__init__.py:705
++ #, python-format
++ msgid "repo object for repo %s lacks a _resetSack method\n"
++-msgstr "objekt repozitáře pro repo %s postrádá metodu _resetSack\n"
+++msgstr "repo objekt pro repozitář %s postrádá metodu _resetSack\n"
++
++ #: ../yum/__init__.py:706
++ msgid "therefore this repo cannot be reset.\n"
++-msgstr "proto nemůže toto repo být resetováno.\n"
+++msgstr "proto nemůže být tento repozitář resetován.\n"
++
++ #: ../yum/__init__.py:711
++ msgid "doUpdateSetup() will go away in a future version of Yum.\n"
++@@ -2313,7 +2319,7 @@ msgstr "doUpdateSetup() bude odstraněn v příští verzi Yumu.\n"
++
++ #: ../yum/__init__.py:723
++ msgid "Building updates object"
++-msgstr "Sestavuje se objekt aktualizací"
+++msgstr "Sestavování objektů aktualizací"
++
++ #: ../yum/__init__.py:765
++ msgid "doGroupSetup() will go away in a future version of Yum.\n"
++@@ -2321,17 +2327,17 @@ msgstr "doGroupSetup() bude odstraněn v příští verzi Yumu.\n"
++
++ #: ../yum/__init__.py:790
++ msgid "Getting group metadata"
++-msgstr "Získávají se metadata skupin"
+++msgstr "Získávání metadata skupin"
++
++ #: ../yum/__init__.py:816
++ #, python-format
++ msgid "Adding group file from repository: %s"
++-msgstr "Přidává se skupinový soubor pro repozitář: %s"
+++msgstr "Přidání souboru se skupinou pro repozitář: %s"
++
++ #: ../yum/__init__.py:827
++ #, python-format
++ msgid "Failed to add groups file for repository: %s - %s"
++-msgstr "Selhalo přidání skupinového souboru pro repozitář: %s - %s"
+++msgstr "Selhalo přidání souboru se skupinou pro repozitář: %s - %s"
++
++ #: ../yum/__init__.py:833
++ msgid "No Groups Available in any repository"
++@@ -2339,12 +2345,12 @@ msgstr "V žádném repozitáři nejsou dostupné skupiny"
++
++ #: ../yum/__init__.py:845
++ msgid "Getting pkgtags metadata"
++-msgstr "Získávají se pkgtags metadata"
+++msgstr "Získávání metadat pkgtags"
++
++ #: ../yum/__init__.py:855
++ #, python-format
++ msgid "Adding tags from repository: %s"
++-msgstr "Přidávají se tagy z repozitáře: %s"
+++msgstr "Přidávání tagů z repozitáře: %s"
++
++ #: ../yum/__init__.py:866
++ #, python-format
++@@ -2353,7 +2359,7 @@ msgstr "Selhalo přidání Pkg Tagů pro repozitář: %s - %s"
++
++ #: ../yum/__init__.py:944
++ msgid "Importing additional filelist information"
++-msgstr "Importuji informace z dodatečného seznamu souborů"
+++msgstr "Importování informací z dodatečných seznamů souborů"
++
++ #: ../yum/__init__.py:958
++ #, python-format
++@@ -2365,22 +2371,22 @@ msgid ""
++ "There are unfinished transactions remaining. You might consider running yum-"
++ "complete-transaction first to finish them."
++ 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."
++
++ #: ../yum/__init__.py:983
++ msgid "--> Finding unneeded leftover dependencies"
++-msgstr ""
+++msgstr "--> Hledání nepotřebných závislostí"
++
++ #: ../yum/__init__.py:1041
++ #, python-format
++ msgid "Protected multilib versions: %s != %s"
++-msgstr ""
+++msgstr "Chráněné verze multilib-u: %s != %s"
++
++ #: ../yum/__init__.py:1096
++ #, python-format
++ msgid "Trying to remove \"%s\", which is protected"
++-msgstr "Zkuste odstranit \"%s\", který je chráněný"
+++msgstr "Pokus o odstranění \"%s\", který je chráněn"
++
++ #: ../yum/__init__.py:1217
++ msgid ""
++@@ -2388,7 +2394,7 @@ msgid ""
++ "Packages skipped because of dependency problems:"
++ 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:"
++
++ #: ../yum/__init__.py:1221
++ #, python-format
++@@ -2400,8 +2406,7 @@ msgstr " %s z %s"
++ #, python-format
++ msgid "** Found %d pre-existing rpmdb problem(s), 'yum check' output follows:"
++ 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\":"
++
++ #: ../yum/__init__.py:1395
++ msgid "Warning: RPMDB altered outside of yum."
++@@ -2409,11 +2414,11 @@ msgstr "Varování: RPMDB byla změněna mimo yum."
++
++ #: ../yum/__init__.py:1407
++ msgid "missing requires"
++-msgstr "chybějící požadavek"
+++msgstr "chybějící requires"
++
++ #: ../yum/__init__.py:1408
++ msgid "installed conflict"
++-msgstr "konflikt nainstalovaného"
+++msgstr "instalační konflikt"
++
++ #: ../yum/__init__.py:1525
++ msgid ""
++@@ -2441,14 +2446,14 @@ msgstr "Selhalo odstranění transakčního souboru %s."
++ #: ../yum/__init__.py:1590
++ #, python-format
++ msgid "%s was supposed to be installed but is not!"
++-msgstr "%s mělo být nainstalováno, ale není!"
+++msgstr "%s by mělo být nainstalováno, ale není!"
++
++ #. maybe a file log here, too
++ #. but raising an exception is not going to do any good
++ #: ../yum/__init__.py:1651
++ #, 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
++ #, python-format
++@@ -2459,7 +2464,7 @@ msgstr "Nelze otevřít zámek %s: %s"
++ #: ../yum/__init__.py:1785
++ #, 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í."
++
++ #. Another copy seems to be running.
++ #: ../yum/__init__.py:1789
++@@ -2488,17 +2493,17 @@ msgstr "Nelze zkontrolovat kontrolní součet"
++
++ #: ../yum/__init__.py:1894
++ 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
++ #, 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
++ #, 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
++@@ -2507,9 +2512,9 @@ msgid ""
++ " * free %s\n"
++ " * needed %s"
++ msgstr ""
++-"Nedostatek diskového prostoru ve stahovacím adresáři %s\n"
++-" * volno %s\n"
++-" * potřeba %s"
+++"Nedostatek místa v cílovém adresáři pro stahování: %s\n"
+++" * volné místo %s\n"
+++" * je potřeba %s"
++
++ #: ../yum/__init__.py:2052
++ msgid "Header is not complete."
++@@ -2520,8 +2525,8 @@ msgstr "Hlavička není kompletní."
++ msgid ""
++ "Header not in local cache and caching-only mode enabled. Cannot download %s"
++ 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"
++
++ #: ../yum/__init__.py:2147
++ #, python-format
++@@ -2546,7 +2551,7 @@ msgstr "Balíček %s není podepsán"
++ #: ../yum/__init__.py:2202
++ #, python-format
++ msgid "Cannot remove %s"
++-msgstr "Nemohu odstranit %s"
+++msgstr "Nelze odstranit %s"
++
++ #: ../yum/__init__.py:2206
++ #, python-format
++@@ -2556,7 +2561,7 @@ msgstr "%s odstraněn"
++ #: ../yum/__init__.py:2252
++ #, python-format
++ msgid "Cannot remove %s file %s"
++-msgstr "Nemohu odstranit %s soubor %s"
+++msgstr "Nelze odstranit %s soubor %s"
++
++ #: ../yum/__init__.py:2256
++ #, python-format
++@@ -2566,17 +2571,17 @@ msgstr "%s soubor %s odstraněn"
++ #: ../yum/__init__.py:2258
++ #, python-format
++ msgid "%d %s files removed"
++-msgstr "%d %s soubor odstraněn"
+++msgstr "%d %s souborů odstraněno"
++
++ #: ../yum/__init__.py:2327
++ #, 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
++ #, 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
++ msgid ""
++@@ -2589,31 +2594,31 @@ msgstr ""
++ #: ../yum/__init__.py:2675
++ #, python-format
++ msgid "Searching %d packages"
++-msgstr "Prohledává se %d balíčků"
+++msgstr "Prohledávání %d balíčků"
++
++ #: ../yum/__init__.py:2679
++ #, python-format
++ msgid "searching package %s"
++-msgstr "prohledává se balíček %s"
+++msgstr "vyhledávání balíčku %s"
++
++ #: ../yum/__init__.py:2691
++ 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
++ 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
++ 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"
++
++ #: ../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
++ #, 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
++ #, python-format
++@@ -2623,44 +2628,44 @@ msgstr "balíček %s nebyl označen ve skupině %s"
++ #: ../yum/__init__.py:2887
++ #, 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
++ #, 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
++ #, 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
++ #, python-format
++ msgid "Group %s does have %u conditional packages, which may get installed."
++-msgstr ""
+++msgstr "Skupina %s má %u volitelných balíčků, které mohou být nainstalovány."
++
++ #. This can happen due to excludes after .up has
++ #. happened.
++ #: ../yum/__init__.py:3002
++ #, 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
++ #, 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
++ #, python-format
++ msgid "Invalid version flag from: %s"
++-msgstr ""
+++msgstr "Neplatný příznak verze z: %s"
++
++ #: ../yum/__init__.py:3096 ../yum/__init__.py:3101
++ #, 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
++ msgid "Package Object was not a package object instance"
++@@ -2668,18 +2673,18 @@ msgstr "Objekt balíčku nebyl instancí balíčkového objektu"
++
++ #: ../yum/__init__.py:3405
++ 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
++ #, python-format
++ msgid "Checking for virtual provide or file-provide for %s"
++-msgstr "Hledá se virtuální poskytovatel nebo soubor poskytující %s"
+++msgstr "Zjišťování virtuálního provide nebo file-provide pro %s"
++
++ #: ../yum/__init__.py:3430 ../yum/__init__.py:3775 ../yum/__init__.py:3969
++ #: ../yum/__init__.py:4289
++ #, python-format
++ msgid "No Match for argument: %s"
++-msgstr "Nenalezena shoda pro argument: %s"
+++msgstr "Pro argument nenalezena shoda: %s"
++
++ #: ../yum/__init__.py:3507
++ #, python-format
++@@ -2688,7 +2693,7 @@ msgstr "Balíček %s je nainstalován, ale není dostupný"
++
++ #: ../yum/__init__.py:3510
++ 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
++ #, python-format
++@@ -2698,7 +2703,8 @@ msgstr "Balíček: %s - již je v transakční sadě"
++ #: ../yum/__init__.py:3550
++ #, 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"
++
++ #: ../yum/__init__.py:3555
++ #, python-format
++@@ -2706,13 +2712,15 @@ msgid ""
++ "Package %s is obsoleted by %s, but obsoleting package does not provide for "
++ "requirements"
++ 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í"
++
++ #: ../yum/__init__.py:3558
++ #, python-format
++ msgid "Package %s is obsoleted by %s, trying to install %s instead"
++ 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"
++
++ #: ../yum/__init__.py:3566
++ #, python-format
++@@ -2722,12 +2730,12 @@ msgstr "Balíček %s je již nainstalován a v poslední verzi"
++ #: ../yum/__init__.py:3580
++ #, 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."
+++msgstr "Balíček odpovídající %s je již nainstalován. Vyhledání aktualizací."
++
++ #. update everything (the easy case)
++ #: ../yum/__init__.py:3684
++ 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
++@@ -2757,17 +2765,17 @@ msgstr "Neaktualizuje se balíček, který jej již aktuální: %s.%s %s:%s-%s"
++
++ #: ../yum/__init__.py:3982
++ msgid "No package matched to remove"
++-msgstr "Nenalezen žádný shodný balíček pro odstranění"
+++msgstr "Nenalezen žádný balíček pro odstranění"
++
++ #: ../yum/__init__.py:3988
++ #, 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
++ #, python-format
++ msgid "Removing %s from the transaction"
++-msgstr "Odstraňuji %s z transakce"
+++msgstr "Odstranění %s z transakce"
++
++ #: ../yum/__init__.py:4029
++ #, python-format
++@@ -2777,23 +2785,24 @@ msgstr "Nelze otevřít: %s. Přeskakuje se."
++ #: ../yum/__init__.py:4032 ../yum/__init__.py:4150 ../yum/__init__.py:4226
++ #, python-format
++ msgid "Examining %s: %s"
++-msgstr "Zkoumá se %s: %s"
+++msgstr "Zkoumání %s: %s"
++
++ #: ../yum/__init__.py:4036
++ #, 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
++ #, python-format
++ msgid ""
++ "Cannot add package %s to transaction. Not a compatible architecture: %s"
++-msgstr "Nelze přidat balíček %s do transakce. Nekompatibilní architektura: %s"
+++msgstr "Do transakce nelze přidat balíček %s. Nekompatibilní architektura: %s"
++
++ #: ../yum/__init__.py:4051
++ #, 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"
++
++ #: ../yum/__init__.py:4059
++ #, python-format
++@@ -2801,8 +2810,8 @@ msgid ""
++ "Package %s not installed, cannot update it. Run yum install to install it "
++ "instead."
++ 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."
++
++ #: ../yum/__init__.py:4078 ../yum/__init__.py:4085
++ #, python-format
++@@ -2810,26 +2819,28 @@ 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."
++
++ #: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234
++ #, python-format
++ msgid "Excluding %s"
++-msgstr "Vynechává se %s"
+++msgstr "Vynechání %s"
++
++ #: ../yum/__init__.py:4099
++ #, 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
++ #, 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
++ #, 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
++ #, python-format
++@@ -2847,7 +2858,7 @@ msgstr "Problém při reinstalaci: žádný shodný balíček %s k instalaci"
++
++ #: ../yum/__init__.py:4311
++ 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
++ #, python-format
++@@ -2862,7 +2873,7 @@ msgstr "Neexistuje shoda pro dostupný balíček: %s"
++ #: ../yum/__init__.py:4372
++ #, 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
++ #, python-format
++@@ -2872,7 +2883,7 @@ msgstr "Nepodařilo se snížit verzi: %s"
++ #: ../yum/__init__.py:4516
++ #, python-format
++ msgid "Retrieving key from %s"
++-msgstr ""
+++msgstr "Získávání klíče z %s"
++
++ #: ../yum/__init__.py:4534
++ msgid "GPG key retrieval failed: "
++@@ -2883,11 +2894,11 @@ msgstr "Získání GPG klíče selhalo: "
++ #: ../yum/__init__.py:4557
++ #, 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
++ 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
++ #, python-format
++@@ -2897,7 +2908,7 @@ msgstr "Neplatný GPG klíč pro %s: %s"
++ #: ../yum/__init__.py:4576
++ #, 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
++ #, python-format
++@@ -2907,6 +2918,10 @@ msgid ""
++ " Package: %s (%s)\n"
++ " From : %s"
++ msgstr ""
+++"Načtení %s klíče 0x%s:\n"
+++" Userid : %s\n"
+++" Balíček: %s (%s)\n"
+++" Z : %s"
++
++ #: ../yum/__init__.py:4600
++ #, python-format
++@@ -2915,6 +2930,9 @@ msgid ""
++ " Userid: \"%s\"\n"
++ " From : %s"
++ msgstr ""
+++"Načtení %s klíče 0x%s:\n"
+++" Userid: \"%s\"\n"
+++" Z : %s"
++
++ #: ../yum/__init__.py:4634
++ #, python-format
++@@ -2932,7 +2950,7 @@ msgstr "Import klíče proběhl úspěšně"
++
++ #: ../yum/__init__.py:4676
++ msgid "Didn't install any keys"
++-msgstr ""
+++msgstr "Nebyly instalovány žádné klíče"
++
++ #: ../yum/__init__.py:4680
++ #, python-format
++@@ -2940,8 +2958,8 @@ msgid ""
++ "The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
++ "Check that the correct key URLs are configured for this repository."
++ msgstr ""
++-"GPG 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."
++
++ #: ../yum/__init__.py:4689
++ msgid "Import of key(s) didn't help, wrong key(s)?"
++@@ -2959,7 +2977,7 @@ msgstr "Import klíče selhal"
++ #: ../yum/__init__.py:4770
++ #, 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
++ #, python-format
++@@ -2972,7 +2990,7 @@ msgstr ""
++
++ #: ../yum/__init__.py:4924
++ msgid "Unable to find a suitable mirror."
++-msgstr "Nemohu nalézt vhodné zrcadlo"
+++msgstr "Nelze nalézt vhodné zrcadlo"
++
++ #: ../yum/__init__.py:4926
++ msgid "Errors were encountered while downloading packages."
++@@ -2981,7 +2999,7 @@ msgstr "Při stahování balíčků došlo k chybě."
++ #: ../yum/__init__.py:4981
++ #, 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
++ msgid "Test Transaction Errors: "
++@@ -2990,75 +3008,75 @@ msgstr "Chyby testu transakce: "
++ #: ../yum/__init__.py:5098
++ #, 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
++ 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
++ #, python-format
++ msgid "Could not save transaction file %s: %s"
++-msgstr ""
+++msgstr "Nelze uložit transakční soubor %s: %s"
++
++ #: ../yum/__init__.py:5195
++ #, 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
++ msgid "rpmdb ver mismatched saved transaction version, "
++-msgstr ""
+++msgstr "rpmdb obsahuje jinou verzi než je v uložené transakci, "
++
++ #: ../yum/__init__.py:5216
++ msgid " ignoring, as requested."
++-msgstr ""
+++msgstr " ignorováno, jak bylo žádáno."
++
++ #: ../yum/__init__.py:5219 ../yum/__init__.py:5354
++ msgid " aborting."
++-msgstr ""
+++msgstr " přerušeno."
++
++ #: ../yum/__init__.py:5228
++ msgid "cannot find tsflags or tsflags not integer."
++-msgstr ""
+++msgstr "nelze nalézt tsflags nebo tsflags není celé číslo."
++
++ #: ../yum/__init__.py:5267
++ #, python-format
++ msgid "Found txmbr in unknown current state: %s"
++-msgstr ""
+++msgstr "Nalezen txmbr v neznámém stavu: %s"
++
++ #: ../yum/__init__.py:5271
++ #, 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
++ #, python-format
++ msgid "Could not find txmbr: %s from origin: %s"
++-msgstr ""
+++msgstr "Nelze nalézt txmbr: %s z: %s"
++
++ #: ../yum/__init__.py:5349
++ 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
++ msgid " ignoring, as requested. You must redepsolve!"
++-msgstr ""
+++msgstr " ignorováno. Musíte spustit redepsolve!"
++
++ #. Mostly copied from YumOutput._outKeyValFill()
++ #: ../yum/plugins.py:209
++ msgid "Loaded plugins: "
++-msgstr "Zavedeny zásuvné moduly: "
+++msgstr "Zavedené moduly: "
++
++ #: ../yum/plugins.py:223 ../yum/plugins.py:229
++ #, python-format
++ msgid "No plugin match for: %s"
++-msgstr "Neexistuje zásuvný modul pro: %s"
+++msgstr "Neexistuje shoda modulu pro: %s"
++
++ #: ../yum/plugins.py:259
++ #, python-format
++ msgid "Not loading \"%s\" plugin, as it is disabled"
++-msgstr "Nezavádí se „%s“ modul, protože je zakázán"
+++msgstr "Nezaveden modul „%s“, protože je zakázán"
++
++ #. Give full backtrace:
++ #: ../yum/plugins.py:271
++@@ -3079,7 +3097,7 @@ msgstr "Modul „%s“ požaduje API %s. Podporované API je %s."
++ #: ../yum/plugins.py:316
++ #, python-format
++ msgid "Loading \"%s\" plugin"
++-msgstr "Zavádí se zásuvný modul „%s“"
+++msgstr "Zaveden modul „%s“"
++
++ #: ../yum/plugins.py:323
++ #, python-format
++@@ -3104,7 +3122,7 @@ msgstr "registrace příkazů není podporována"
++
++ #: ../yum/rpmsack.py:148
++ msgid "has missing requires of"
++-msgstr "má chybějící požadavky"
+++msgstr "má chybějící requires"
++
++ #: ../yum/rpmsack.py:151
++ msgid "has installed conflicts"
++@@ -3118,16 +3136,16 @@ msgstr "%s je duplicitní s %s"
++ #: ../yum/rpmsack.py:168
++ #, python-format
++ msgid "%s is obsoleted by %s"
++-msgstr "%s je zastaralé novějším %s"
+++msgstr "%s je označeno za zastaralé balíčkem %s"
++
++ #: ../yum/rpmsack.py:176
++ #, python-format
++ msgid "%s provides %s but it cannot be found"
++-msgstr "%s poskytuje %s, ale to nelze nalézt"
+++msgstr "%s poskytuje %s, avšak nelze to nalézt"
++
++ #: ../yum/rpmtrans.py:80
++ msgid "Repackaging"
++-msgstr "Přebaluje se"
+++msgstr "Přebalení"
++
++ #: ../rpmUtils/oldUtils.py:33
++ #, python-format
++@@ -3141,11 +3159,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?"
++-msgstr "Nelze otevřít databázi RPM pro čtení. Možná je již používána?"
+++msgstr "Nelze otevřít RPM databázi pro čtení. Možná je právě používána?"
++
++ #: ../rpmUtils/oldUtils.py:183
++ msgid "Got an empty Header, something has gone wrong"
++-msgstr "Vrátila se prázdná hlavička. Něco se stalo špatně."
+++msgstr "Získána prázdná hlavička. Něco je špatně."
++
++ #: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
++ #: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
++diff --git a/po/da.po b/po/da.po
++index a7202e2..30a8c8e 100644
++--- a/po/da.po
+++++ b/po/da.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Kris Thomsen <lakristho at gmail.com>, 2011
+++# Kris Thomsen <lakristho at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/de.po b/po/de.po
++index fa39cb0..642200d 100644
++--- a/po/de.po
+++++ b/po/de.po
++@@ -2,16 +2,17 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Laurin <lineak at fedoraproject.org>, 2011
++-# Vinzenz Vietzke <vinz at fedoraproject.org>, 2011
++-# Hendrik Richter <hendrikr at gnome.org>, 2011
+++# Laurin <lineak at fedoraproject.org>, 2011.
+++# Vinzenz Vietzke <vinz at fedoraproject.org>, 2011.
+++# Fabian Affolter <fab at fedoraproject.org>, 2011.
+++# Hendrik Richter <hendrikr at gnome.org>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-08-12 21:48+0000\n"
+++"Last-Translator: fab <fab at fedoraproject.org>\n"
++ "Language-Team: German (http://www.transifex.net/projects/p/yum/team/de/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -747,7 +748,7 @@ msgstr " Beschreibung: %s"
++ #: ../output.py:788
++ #, python-format
++ msgid " Language: %s"
++-msgstr ""
+++msgstr "Sprache: %s"
++
++ #: ../output.py:790
++ msgid " Mandatory Packages:"
++@@ -854,7 +855,7 @@ msgstr "Nicht installiert"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Nicht verfügbar"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -983,7 +984,7 @@ msgstr "E"
++
++ #: ../output.py:1325
++ msgid "R"
++-msgstr ""
+++msgstr "R"
++
++ #: ../output.py:1326
++ msgid "D"
++@@ -1016,7 +1017,7 @@ msgstr "Schlechte Transaktions-IDs oder Paket(e) angegeben"
++
++ #: ../output.py:1484
++ msgid "Command line"
++-msgstr ""
+++msgstr "Kommandozeile"
++
++ #: ../output.py:1486 ../output.py:1908
++ msgid "Login user"
++@@ -1086,22 +1087,22 @@ msgstr "Anfang rpmdb :"
++ #: ../output.py:1749
++ #, python-format
++ msgid "(%u seconds)"
++-msgstr ""
+++msgstr "(%u Sekunden)"
++
++ #: ../output.py:1751
++ #, python-format
++ msgid "(%u minutes)"
++-msgstr ""
+++msgstr "(%u Minuten)"
++
++ #: ../output.py:1753
++ #, python-format
++ msgid "(%u hours)"
++-msgstr ""
+++msgstr "(%u Stunden)"
++
++ #: ../output.py:1755
++ #, python-format
++ msgid "(%u days)"
++-msgstr ""
+++msgstr "(%u Tage)"
++
++ #: ../output.py:1756
++ msgid "End time :"
++diff --git a/po/el.po b/po/el.po
++index 8df34e7..9d6f6e4 100644
++--- a/po/el.po
+++++ b/po/el.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Dimitris Glezos <glezos at indifex.com>, 2011
+++# Dimitris Glezos <glezos at indifex.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/en_GB.po b/po/en_GB.po
++index 0f3c750..3468601 100644
++--- a/po/en_GB.po
+++++ b/po/en_GB.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Bruce Cowan <l10n at bcowan.fastmail.co.uk>, 2011
+++# Bruce Cowan <l10n at bcowan.fastmail.co.uk>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/es.po b/po/es.po
++index 2b1397d..7282656 100644
++--- a/po/es.po
+++++ b/po/es.po
++@@ -2,15 +2,16 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# beckerde <domingobecker at gmail.com>, 2011
++-# Claudio Rodrigo Pereyra Diaz <elsupergomez at gmail.com>, 2011
+++# Dennis Tobar <dennis.tobar at gmail.com>, 2011.
+++# beckerde <domingobecker at gmail.com>, 2011.
+++# Claudio Rodrigo Pereyra Diaz <elsupergomez at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-06-07 21:22+0000\n"
+++"Last-Translator: dennistobar <dennis.tobar at gmail.com>\n"
++ "Language-Team: Spanish (Castilian) <trans-es at lists.fedoraproject.org>\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -326,7 +327,7 @@ msgstr "No se ha encontrado ningún paquete para %s"
++
++ #: ../cli.py:1184
++ msgid "Cleaning repos: "
++-msgstr "Limpiando repositorios:"
+++msgstr "Limpiando repositorios: "
++
++ #: ../cli.py:1189
++ msgid "Cleaning up Everything"
++@@ -510,7 +511,7 @@ msgstr "operación detallada"
++
++ #: ../cli.py:1673
++ msgid "answer yes for all questions"
++-msgstr "responde \"si\" a todas las preguntas"
+++msgstr "responde \"sí\" a todas las preguntas"
++
++ #: ../cli.py:1675
++ msgid "show Yum version and exit"
++@@ -721,7 +722,7 @@ msgstr "s"
++
++ #: ../output.py:684
++ msgid "yes"
++-msgstr "si"
+++msgstr "sí"
++
++ #: ../output.py:685
++ msgid "n"
++@@ -864,7 +865,7 @@ msgstr "No instalado"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "No disponible"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -968,7 +969,7 @@ msgid ""
++ "to exit.\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"
++
++ #: ../output.py:1282
++@@ -1569,7 +1570,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Problema del repositorio: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1898,7 +1899,7 @@ msgstr "Repositorio excluído:"
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Nombre de archivo del repositorio: "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++diff --git a/po/eu.po b/po/eu.po
++index f92862c..3e4b194 100644
++--- a/po/eu.po
+++++ b/po/eu.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# assar <asiersar at yahoo.com>, 2011
+++# assar <asiersar at yahoo.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/fi.po b/po/fi.po
++index 269bf15..4094182 100644
++--- a/po/fi.po
+++++ b/po/fi.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>, 2011
+++# Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/fr.po b/po/fr.po
++index 4636b15..c195152 100644
++--- a/po/fr.po
+++++ b/po/fr.po
++@@ -2,14 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Kévin Raymond <shaiton at fedoraproject.org>, 2011
+++# Kévin Raymond <shaiton at fedoraproject.org>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-06-08 11:39+0000\n"
+++"Last-Translator: dominique <chepioq at gmail.com>\n"
++ "Language-Team: French (http://www.transifex.net/projects/p/yum/team/fr/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -865,7 +865,7 @@ msgstr "Non installé"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Indisponible"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1570,7 +1570,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Problème avec le dépôt : %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1900,7 +1900,7 @@ msgstr "Exclus du dépôt : "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Nom du dépôt : "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++diff --git a/po/gu.po b/po/gu.po
++index e9ad955..4273e7e 100644
++--- a/po/gu.po
+++++ b/po/gu.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# sweta <swkothar at redhat.com>, 2011
+++# sweta <swkothar at redhat.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/hu.po b/po/hu.po
++index db7c07f..584f0f9 100644
++--- a/po/hu.po
+++++ b/po/hu.po
++@@ -2,14 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# András Bögöly <ebogoly at gmail.com>, 2011
+++# András Bögöly <ebogoly at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-07-20 20:41+0000\n"
+++"Last-Translator: bogolyandras <ebogoly at gmail.com>\n"
++ "Language-Team: Hungarian (http://www.transifex.net/projects/p/yum/team/hu/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -284,12 +284,16 @@ msgstr "N/S Megegyezett: %s"
++ #, 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."
++
++ #: ../cli.py:1077
++ #, 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."
++
++ #: ../cli.py:1095
++ #, python-format
++@@ -300,6 +304,8 @@ msgstr "Találat: %s"
++ #, 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."
++
++ #: ../cli.py:1106
++ #, python-format
++@@ -448,7 +454,7 @@ msgstr "--Szín egyikét veszi fel: auto, mindig, soha"
++ #: ../cli.py:1596
++ #, 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
++ msgid "show this help message and exit"
++@@ -851,7 +857,7 @@ msgstr "Nem telepítve"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Nem elérhető"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1001,7 +1007,7 @@ msgstr "Rendszer"
++ #: ../output.py:1411
++ #, 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
++ msgid "No transactions"
++@@ -1549,7 +1555,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Hibás tároló: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1877,7 +1883,7 @@ msgstr "Tároló-kizárt: "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Tároló-fájlnév: "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++@@ -1993,23 +1999,23 @@ msgstr "egy elmentett tranzakció betöltése fájlnév alapján"
++
++ #: ../yumcommands.py:1518
++ msgid "No saved transaction file specified."
++-msgstr ""
+++msgstr "Nincs meghatározva az elmentett tranzakció fájlja."
++
++ #: ../yumcommands.py:1522
++ #, python-format
++ msgid "loading transaction from %s"
++-msgstr ""
+++msgstr "tranzakciók betöltések a következőből: %s"
++
++ #: ../yumcommands.py:1528
++ #, python-format
++ msgid "Transaction loaded from %s with %s members"
++-msgstr ""
+++msgstr "Tranzakció betöltve innen: %s, %s taggal"
++
++ #. This is mainly for PackageSackError from rpmdb.
++ #: ../yummain.py:84
++ #, python-format
++ msgid " Yum checks failed: %s"
++-msgstr ""
+++msgstr " Yum ellenőrzés meghiúsult: %s"
++
++ #: ../yummain.py:114
++ msgid ""
++@@ -2020,7 +2026,7 @@ msgstr ""
++
++ #: ../yummain.py:120
++ msgid "Can't create lock file; exiting"
++-msgstr ""
+++msgstr "Nem sikerült lezárni; kilépés..."
++
++ #. Depsolve stage
++ #: ../yummain.py:167
++@@ -2031,6 +2037,8 @@ msgstr "Függőségek megállapítása"
++ #, python-format
++ msgid "Your transaction was saved, rerun it with: yum load-transaction %s"
++ msgstr ""
+++"A tranzakció sikeresen mentve, újra futtatáshoz a következő parancsot "
+++"használjuk: yum load-transaction %s"
++
++ #: ../yummain.py:288
++ msgid ""
++@@ -2120,12 +2128,12 @@ msgstr "A(z) %s nevű csomag szolgáltatásának módja: %s"
++ #: ../yum/depsolve.py:389 ../yum/depsolve.py:406
++ #, 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
++ #, 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
++ #, python-format
++@@ -2383,12 +2391,12 @@ msgstr ""
++
++ #: ../yum/__init__.py:983
++ msgid "--> Finding unneeded leftover dependencies"
++-msgstr ""
+++msgstr "--> Szükségtelen függőségek keresése"
++
++ #: ../yum/__init__.py:1041
++ #, python-format
++ msgid "Protected multilib versions: %s != %s"
++-msgstr ""
+++msgstr "Védett multilib verzió: %s != %s"
++
++ #: ../yum/__init__.py:1096
++ #, python-format
++@@ -2650,12 +2658,14 @@ msgstr "Nincs telepíthető csomag %s néven."
++ #: ../yum/__init__.py:2941
++ #, 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
++ #, 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."
++
++ #. This can happen due to excludes after .up has
++ #. happened.
++@@ -2672,7 +2682,7 @@ msgstr "Az rpmdb nem tartalmaz csomagleírót a következőre: %s"
++ #: ../yum/__init__.py:3079 ../yum/__init__.py:3129
++ #, python-format
++ msgid "Invalid version flag from: %s"
++-msgstr ""
+++msgstr "Érvénytelen verzió: %s"
++
++ #: ../yum/__init__.py:3096 ../yum/__init__.py:3101
++ #, python-format
++@@ -2840,6 +2850,8 @@ 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."
++
++ #: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234
++ #, python-format
++@@ -2903,7 +2915,7 @@ msgstr "Visszaállítás meghiúsult: %s"
++ #: ../yum/__init__.py:4516
++ #, python-format
++ msgid "Retrieving key from %s"
++-msgstr ""
+++msgstr "GPG kulcs beszerzése a következőből: %s"
++
++ #: ../yum/__init__.py:4534
++ msgid "GPG key retrieval failed: "
++@@ -2914,11 +2926,11 @@ msgstr "GPG kulcs beszerzés meghiúsult: "
++ #: ../yum/__init__.py:4557
++ #, 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
++ 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
++ #, python-format
++@@ -2938,6 +2950,10 @@ msgid ""
++ " Package: %s (%s)\n"
++ " From : %s"
++ msgstr ""
+++"%s GPG kulcs 0x%s importálása:\n"
+++"Felhasználó: %s\n"
+++"Csomag : %s (%s)\n"
+++"Származás: %s"
++
++ #: ../yum/__init__.py:4600
++ #, python-format
++@@ -2946,6 +2962,9 @@ msgid ""
++ " Userid: \"%s\"\n"
++ " From : %s"
++ msgstr ""
+++"%s GPG kulcs 0x%s importálása:\n"
+++"Felhasználó: %s\n"
+++"Származás: %s"
++
++ #: ../yum/__init__.py:4634
++ #, python-format
++@@ -2963,7 +2982,7 @@ msgstr "A kulcs importálása sikeres"
++
++ #: ../yum/__init__.py:4676
++ msgid "Didn't install any keys"
++-msgstr ""
+++msgstr "Nem lett telepítve egyetlen kulcs sem"
++
++ #: ../yum/__init__.py:4680
++ #, python-format
++@@ -2990,7 +3009,7 @@ msgstr "A kulcs importálása meghiúsult"
++ #: ../yum/__init__.py:4770
++ #, 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
++ #, python-format
++@@ -3026,55 +3045,59 @@ msgstr "Gyorsítótár-mappa beállítása meghiúsult: %s"
++ #: ../yum/__init__.py:5148 ../yum/__init__.py:5150
++ 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."
++
++ #: ../yum/__init__.py:5179 ../yum/__init__.py:5181
++ #, 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
++ #, 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
++ 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
++ msgid " ignoring, as requested."
++-msgstr ""
+++msgstr " kihagyva, ahogy kértük."
++
++ #: ../yum/__init__.py:5219 ../yum/__init__.py:5354
++ msgid " aborting."
++-msgstr ""
+++msgstr "megszakítás."
++
++ #: ../yum/__init__.py:5228
++ 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
++ #, python-format
++ msgid "Found txmbr in unknown current state: %s"
++-msgstr ""
+++msgstr "txmbr található a jelenleg ismeretlen állapotban: %s"
++
++ #: ../yum/__init__.py:5271
++ #, 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
++ #, python-format
++ msgid "Could not find txmbr: %s from origin: %s"
++-msgstr ""
+++msgstr "Nem található txmbr: %s, innen: %s"
++
++ #: ../yum/__init__.py:5349
++ 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,"
++
++ #: ../yum/__init__.py:5351
++ msgid " ignoring, as requested. You must redepsolve!"
++-msgstr ""
+++msgstr " átugorva, ahogy kérte. Szükséges a redepsolve!"
++
++ #. Mostly copied from YumOutput._outKeyValFill()
++ #: ../yum/plugins.py:209
++diff --git a/po/id_ID.po b/po/id_ID.po
++index 964c239..b2b1cba 100644
++--- a/po/id_ID.po
+++++ b/po/id_ID.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Teguh Dwicaksana <dheche at songolimo.net>, 2011
+++# Teguh Dwicaksana <dheche at songolimo.net>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/it.po b/po/it.po
++index 44b6091..f117682 100644
++--- a/po/it.po
+++++ b/po/it.po
++@@ -2,13 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
+++# Guido Grazioli <guido.grazioli at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-08-20 12:03+0000\n"
+++"Last-Translator: guidograzioli <guido.grazioli at gmail.com>\n"
++ "Language-Team: Italian (http://www.transifex.net/projects/p/yum/team/it/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -157,7 +158,7 @@ msgstr "Errore nel download dei pacchetti:\n"
++
++ #: ../cli.py:525 ../yum/__init__.py:4967
++ msgid "Running Transaction Check"
++-msgstr ""
+++msgstr "Esecuzione del controllo di transazione"
++
++ #: ../cli.py:534 ../yum/__init__.py:4976
++ msgid "ERROR You need to update rpm to handle:"
++@@ -165,7 +166,7 @@ msgstr "ERRORE Occorre aggiornare rpm per gestire:"
++
++ #: ../cli.py:536 ../yum/__init__.py:4979
++ msgid "ERROR with transaction check vs depsolve:"
++-msgstr ""
+++msgstr "ERRORE del controllo di transazione nei confronti di depsolve:"
++
++ #: ../cli.py:542
++ msgid "RPM needs to be updated"
++@@ -275,18 +276,22 @@ msgstr "Nessun pacchetto specificato"
++ #: ../cli.py:1058
++ #, python-format
++ msgid "N/S Matched: %s"
++-msgstr ""
+++msgstr "N/D trovati: %s"
++
++ #: ../cli.py:1075
++ #, 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."
++
++ #: ../cli.py:1077
++ #, 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."
++
++ #: ../cli.py:1095
++ #, python-format
++@@ -297,6 +302,8 @@ msgstr "Trovato: %s"
++ #, 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."
++
++ #: ../cli.py:1106
++ #, python-format
++@@ -351,7 +358,7 @@ msgstr "Pulizia plugin"
++ #: ../cli.py:1247
++ #, python-format
++ msgid "Warning: No groups match: %s"
++-msgstr ""
+++msgstr "Attenzione: nessun gruppo trovato per: %s"
++
++ #: ../cli.py:1264
++ msgid "Installed Groups:"
++@@ -359,7 +366,7 @@ msgstr "Gruppi installati:"
++
++ #: ../cli.py:1270
++ msgid "Installed Language Groups:"
++-msgstr ""
+++msgstr "Gruppi lingua installati:"
++
++ #: ../cli.py:1276
++ msgid "Available Groups:"
++@@ -367,7 +374,7 @@ msgstr "Gruppi disponibili:"
++
++ #: ../cli.py:1282
++ msgid "Available Language Groups:"
++-msgstr ""
+++msgstr "Gruppi lingua disponibili:"
++
++ #: ../cli.py:1285
++ msgid "Done"
++@@ -449,7 +456,7 @@ msgstr "--color deve specificare uno tra: auto, always, never"
++ #: ../cli.py:1596
++ #, python-format
++ msgid "--installroot must be an absolute path: %s"
++-msgstr ""
+++msgstr "--installroot deve essere un percorso assoluto: %s"
++
++ #: ../cli.py:1642
++ msgid "show this help message and exit"
++@@ -549,7 +556,7 @@ msgstr "ignora pacchetti con problemi di risoluzione dipendenze"
++
++ #: ../cli.py:1706
++ msgid "control whether color is used"
++-msgstr "controlla se il colore è usato"
+++msgstr "imposta l'uso del colore"
++
++ #: ../cli.py:1708
++ msgid "set value of $releasever in yum config and repo files"
++@@ -740,7 +747,7 @@ msgstr " Descrizione: %s"
++ #: ../output.py:788
++ #, python-format
++ msgid " Language: %s"
++-msgstr ""
+++msgstr " Lingua: %s"
++
++ #: ../output.py:790
++ msgid " Mandatory Packages:"
++@@ -850,7 +857,7 @@ msgstr "Non installato"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Non disponibile"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1000,11 +1007,11 @@ msgstr "Sistema"
++ #: ../output.py:1411
++ #, 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
++ msgid "No transactions"
++-msgstr ""
+++msgstr "Nessuna transazione"
++
++ #: ../output.py:1446 ../output.py:2013
++ msgid "Bad transaction IDs, or package(s), given"
++@@ -1012,7 +1019,7 @@ msgstr "L'ID transazione, o il pacchetto specificato, non è corretto"
++
++ #: ../output.py:1484
++ msgid "Command line"
++-msgstr ""
+++msgstr "Linea di comando"
++
++ #: ../output.py:1486 ../output.py:1908
++ msgid "Login user"
++@@ -1082,22 +1089,22 @@ msgstr "rpmdb iniziale :"
++ #: ../output.py:1749
++ #, python-format
++ msgid "(%u seconds)"
++-msgstr ""
+++msgstr "(%u secondi)"
++
++ #: ../output.py:1751
++ #, python-format
++ msgid "(%u minutes)"
++-msgstr ""
+++msgstr "(%u minuti)"
++
++ #: ../output.py:1753
++ #, python-format
++ msgid "(%u hours)"
++-msgstr ""
+++msgstr "(%u ore)"
++
++ #: ../output.py:1755
++ #, python-format
++ msgid "(%u days)"
++-msgstr ""
+++msgstr "(%u giorni)"
++
++ #: ../output.py:1756
++ msgid "End time :"
++@@ -1122,7 +1129,7 @@ msgstr "Interrotto"
++
++ #: ../output.py:1773
++ msgid "Failures:"
++-msgstr ""
+++msgstr "Operazioni fallite:"
++
++ #: ../output.py:1777
++ msgid "Failure:"
++@@ -1251,7 +1258,7 @@ msgstr "installato"
++
++ #: ../output.py:2107
++ msgid "an update"
++-msgstr ""
+++msgstr "un aggiornamento"
++
++ #: ../output.py:2108
++ msgid "erased"
++@@ -1263,11 +1270,11 @@ msgstr "reinstallato"
++
++ #: ../output.py:2110
++ msgid "a downgrade"
++-msgstr ""
+++msgstr "un downgrade"
++
++ #: ../output.py:2111
++ msgid "obsoleting"
++-msgstr ""
+++msgstr "reso obsoleto"
++
++ #: ../output.py:2112
++ msgid "updated"
++@@ -1280,7 +1287,7 @@ msgstr "reso obsoleto"
++ #: ../output.py:2117
++ #, 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
++ msgid "--> Running transaction check"
++@@ -1512,7 +1519,7 @@ msgstr "Completo!"
++
++ #: ../yumcommands.py:42
++ msgid " Mini usage:\n"
++-msgstr ""
+++msgstr " Uso comune:\n"
++
++ #: ../yumcommands.py:52
++ msgid "You need to be root to perform this command."
++@@ -1551,7 +1558,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Repository del problema: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1728,7 +1735,7 @@ msgstr "Elimina i dati nella cache"
++
++ #: ../yumcommands.py:613
++ msgid "Find what package provides the given value"
++-msgstr "Determina il pacchetto che fornisce il valore dato"
+++msgstr "Determina quale pacchetto fornisce un dato valore"
++
++ #: ../yumcommands.py:633
++ msgid "Check for available package updates"
++@@ -1879,7 +1886,7 @@ msgstr "Repo-excluded: "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Repo-filename: "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++@@ -1991,27 +1998,27 @@ msgstr "Identifica gli errori nell'rpmdb"
++
++ #: ../yumcommands.py:1514
++ msgid "load a saved transaction from filename"
++-msgstr ""
+++msgstr "carica una transazione salvata da un file"
++
++ #: ../yumcommands.py:1518
++ msgid "No saved transaction file specified."
++-msgstr ""
+++msgstr "Nessun file specificato per la transazione salvata."
++
++ #: ../yumcommands.py:1522
++ #, python-format
++ msgid "loading transaction from %s"
++-msgstr ""
+++msgstr "caricamento transazione da %s"
++
++ #: ../yumcommands.py:1528
++ #, python-format
++ msgid "Transaction loaded from %s with %s members"
++-msgstr ""
+++msgstr "Transazione caricata da %s con %s membri"
++
++ #. This is mainly for PackageSackError from rpmdb.
++ #: ../yummain.py:84
++ #, python-format
++ msgid " Yum checks failed: %s"
++-msgstr ""
+++msgstr " Controlli Yum falliti: %s"
++
++ #: ../yummain.py:114
++ msgid ""
++@@ -2022,7 +2029,7 @@ msgstr ""
++
++ #: ../yummain.py:120
++ msgid "Can't create lock file; exiting"
++-msgstr ""
+++msgstr "Impossibile creare il file di lock; uscita"
++
++ #. Depsolve stage
++ #: ../yummain.py:167
++@@ -2033,6 +2040,8 @@ msgstr "Risoluzione dipendenze"
++ #, python-format
++ msgid "Your transaction was saved, rerun it with: yum load-transaction %s"
++ msgstr ""
+++"La transazione è stata salvata; per eseguirla nuovamente: yum load-"
+++"transaction %s"
++
++ #: ../yummain.py:288
++ msgid ""
++@@ -2060,7 +2069,7 @@ msgstr "tsflag non valido nel file di configurazione: %s"
++ #: ../yum/depsolve.py:164
++ #, 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
++ #, python-format
++@@ -2122,12 +2131,13 @@ msgstr "Modalità per il pacchetto che fornisce %s: %s"
++ #: ../yum/depsolve.py:389 ../yum/depsolve.py:406
++ #, 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
++ #, python-format
++ msgid "No update paths found for %s. Failure!"
++ msgstr ""
+++"Nessun percorso di aggiornamento trovato per %s. Aggiornamento fallito!"
++
++ #: ../yum/depsolve.py:416
++ #, python-format
++@@ -2387,12 +2397,12 @@ msgstr ""
++
++ #: ../yum/__init__.py:983
++ msgid "--> Finding unneeded leftover dependencies"
++-msgstr ""
+++msgstr "--> Ricerca di dipendenze non necessarie"
++
++ #: ../yum/__init__.py:1041
++ #, python-format
++ msgid "Protected multilib versions: %s != %s"
++-msgstr ""
+++msgstr "Versioni multilib protette: %s != %s"
++
++ #: ../yum/__init__.py:1096
++ #, python-format
++@@ -2649,12 +2659,14 @@ msgstr "Nessun pacchetto con nome %s disponibile per l'installazione"
++ #: ../yum/__init__.py:2941
++ #, 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
++ #, 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."
++
++ #. This can happen due to excludes after .up has
++ #. happened.
++@@ -2671,7 +2683,7 @@ msgstr "Il pacchetto con tupla %s non è stato trovato nel rpmdb"
++ #: ../yum/__init__.py:3079 ../yum/__init__.py:3129
++ #, 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
++ #, python-format
++@@ -2833,6 +2845,8 @@ 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."
++
++ #: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234
++ #, python-format
++@@ -2899,7 +2913,7 @@ msgstr "Downgrade fallito: %s"
++ #: ../yum/__init__.py:4516
++ #, python-format
++ msgid "Retrieving key from %s"
++-msgstr ""
+++msgstr "Recupero chiave da %s"
++
++ #: ../yum/__init__.py:4534
++ msgid "GPG key retrieval failed: "
++@@ -2911,10 +2925,12 @@ msgstr "Recupero chiave GPG fallito: "
++ #, 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"
++
++ #: ../yum/__init__.py:4559
++ 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
++ #, python-format
++@@ -2934,6 +2950,10 @@ msgid ""
++ " Package: %s (%s)\n"
++ " From : %s"
++ msgstr ""
+++"Importazione chiave %s 0x%s:\n"
+++" Userid : %s\n"
+++" Pacchetto: %s (%s)\n"
+++" Da : %s"
++
++ #: ../yum/__init__.py:4600
++ #, python-format
++@@ -2942,6 +2962,9 @@ msgid ""
++ " Userid: \"%s\"\n"
++ " From : %s"
++ msgstr ""
+++"Importazione chiave %s 0x%s:\n"
+++" Userid: %s\n"
+++" Da : %s"
++
++ #: ../yum/__init__.py:4634
++ #, python-format
++@@ -2959,7 +2982,7 @@ msgstr "Chiave importata correttamente"
++
++ #: ../yum/__init__.py:4676
++ msgid "Didn't install any keys"
++-msgstr ""
+++msgstr "Non è stata installata alcuna chiave"
++
++ #: ../yum/__init__.py:4680
++ #, python-format
++@@ -2986,7 +3009,7 @@ msgstr "Importazione chiave fallita"
++ #: ../yum/__init__.py:4770
++ #, 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
++ #, python-format
++@@ -3022,55 +3045,62 @@ msgstr "Impossibile impostare la cachedir: %s"
++ #: ../yum/__init__.py:5148 ../yum/__init__.py:5150
++ msgid "Dependencies not solved. Will not save unresolved transaction."
++ msgstr ""
+++"Dipendenze non risolte. La transazione con dipendenze non risolte non verrà "
+++"salvata."
++
++ #: ../yum/__init__.py:5179 ../yum/__init__.py:5181
++ #, python-format
++ msgid "Could not save transaction file %s: %s"
++-msgstr ""
+++msgstr "Impossibile salvare il file di transazione %s: %s"
++
++ #: ../yum/__init__.py:5195
++ #, 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
++ msgid "rpmdb ver mismatched saved transaction version, "
++ msgstr ""
+++"la versione di rpmdb non corrisponde alla versione della transazione "
+++"salvata, "
++
++ #: ../yum/__init__.py:5216
++ msgid " ignoring, as requested."
++-msgstr ""
+++msgstr " ignorato, come richiesto."
++
++ #: ../yum/__init__.py:5219 ../yum/__init__.py:5354
++ msgid " aborting."
++-msgstr ""
+++msgstr " esecuzione annullata."
++
++ #: ../yum/__init__.py:5228
++ msgid "cannot find tsflags or tsflags not integer."
++-msgstr ""
+++msgstr "impossibile trovare tsflags o tsflags non intero."
++
++ #: ../yum/__init__.py:5267
++ #, 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
++ #, 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
++ #, 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
++ msgid "Transaction members, relations are missing or ts has been modified,"
++ msgstr ""
+++"Membri della transazione, ci sono relazioni mancanti oppure ts è stata "
+++"modificata,"
++
++ #: ../yum/__init__.py:5351
++ msgid " ignoring, as requested. You must redepsolve!"
++ msgstr ""
+++" ignorati, come richiesto. E' necessario eseguire nuovamente depsolve."
++
++ #. Mostly copied from YumOutput._outKeyValFill()
++ #: ../yum/plugins.py:209
++diff --git a/po/ja.po b/po/ja.po
++index a232b0c..1145ed8 100644
++--- a/po/ja.po
+++++ b/po/ja.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Hajime Taira <htaira at redhat.com>, 2011
+++# Hajime Taira <htaira at redhat.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/lt_LT.po b/po/lt_LT.po
++index 4a1d933..db2a2ce 100644
++--- a/po/lt_LT.po
+++++ b/po/lt_LT.po
++@@ -2,14 +2,15 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# aurisc4 <aurisc4 at gmail.com>, 2011
+++# <aurisc4 at gmail.com>, 2011.
+++# aurisc4 <aurisc4 at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-07-15 21:31+0000\n"
+++"Last-Translator: aurisc4 <aurisc4 at gmail.com>\n"
++ "Language-Team: Lithuanian (Lithuania) (http://www.transifex.net/projects/p/yum/team/lt_LT/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -851,7 +852,7 @@ msgstr "Neįdiegtas"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Neprieinama"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1550,7 +1551,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Problemų saugykla: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1878,7 +1879,7 @@ msgstr "Saugykloje išskirta: "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Saugyklos failas: "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++diff --git a/po/pa.po b/po/pa.po
++index e714500..9c5f07b 100644
++--- a/po/pa.po
+++++ b/po/pa.po
++@@ -2,14 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# A S Alam <apreet.alam at gmail.com>, 2011
+++# A S Alam <apreet.alam at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-08-18 01:40+0000\n"
+++"Last-Translator: aalam <apreet.alam at gmail.com>\n"
++ "Language-Team: Panjabi (Punjabi) <punjabi-users at lists.sf.net>\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -160,7 +160,7 @@ msgstr "ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲ
++
++ #: ../cli.py:525 ../yum/__init__.py:4967
++ msgid "Running Transaction Check"
++-msgstr ""
+++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਚੈੱਕ ਚੱਲ ਰਿਹਾ ਹੈ"
++
++ #: ../cli.py:534 ../yum/__init__.py:4976
++ msgid "ERROR You need to update rpm to handle:"
++@@ -352,7 +352,7 @@ msgstr "ਪਲੱਗਇਨ ਸਾਫ਼ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆ
++ #: ../cli.py:1247
++ #, python-format
++ msgid "Warning: No groups match: %s"
++-msgstr ""
+++msgstr "ਸਾਵਧਾਨ: ਕੋਈ ਮਿਲਦਾ ਗਰੁੱਪ ਨਹੀਂ: %s"
++
++ #: ../cli.py:1264
++ msgid "Installed Groups:"
++@@ -360,7 +360,7 @@ msgstr "ਇੰਸਟਾਲ ਹੋਏ ਗਰੁੱਪ:"
++
++ #: ../cli.py:1270
++ msgid "Installed Language Groups:"
++-msgstr ""
+++msgstr "ਇੰਸਟਾਲ ਹੋਏ ਭਾਸ਼ਾ ਗਰੁੱਪ:"
++
++ #: ../cli.py:1276
++ msgid "Available Groups:"
++@@ -368,7 +368,7 @@ msgstr "ਉਪਲੱਬਧ ਗਰੁੱਪ:"
++
++ #: ../cli.py:1282
++ msgid "Available Language Groups:"
++-msgstr ""
+++msgstr "ਉਪਲੱਬਧ ਭਾਸ਼ਾ ਗਰੁੱਪ:"
++
++ #: ../cli.py:1285
++ msgid "Done"
++@@ -737,7 +737,7 @@ msgstr " ਵੇਰਵਾ: %s"
++ #: ../output.py:788
++ #, python-format
++ msgid " Language: %s"
++-msgstr ""
+++msgstr " ਭਾਸ਼ਾ: %s"
++
++ #: ../output.py:790
++ msgid " Mandatory Packages:"
++@@ -844,7 +844,7 @@ msgstr "ਇੰਸਟਾਲ ਨਹੀਂ"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -998,7 +998,7 @@ msgstr ""
++
++ #: ../output.py:1421 ../output.py:1592
++ msgid "No transactions"
++-msgstr ""
+++msgstr "ਕੋਈ ਟਰਾਂਸੈਕਸ਼ਨ ਨਹੀਂ"
++
++ #: ../output.py:1446 ../output.py:2013
++ msgid "Bad transaction IDs, or package(s), given"
++@@ -1006,7 +1006,7 @@ msgstr "ਖ਼ਰਾਬ ਟਰਾਂਸੈਕਸ਼ਨ ID, ਜਾਂ ਪੈਕ
++
++ #: ../output.py:1484
++ msgid "Command line"
++-msgstr ""
+++msgstr "ਕਮਾਂਡ ਲਾਈਨ"
++
++ #: ../output.py:1486 ../output.py:1908
++ msgid "Login user"
++@@ -1076,22 +1076,22 @@ msgstr "rpmdb ਸ਼ੁਰੂ :"
++ #: ../output.py:1749
++ #, python-format
++ msgid "(%u seconds)"
++-msgstr ""
+++msgstr "(%u ਸਕਿੰਟ)"
++
++ #: ../output.py:1751
++ #, python-format
++ msgid "(%u minutes)"
++-msgstr ""
+++msgstr "(%u ਮਿੰਟ)"
++
++ #: ../output.py:1753
++ #, python-format
++ msgid "(%u hours)"
++-msgstr ""
+++msgstr "(%u ਘੰਟੇ)"
++
++ #: ../output.py:1755
++ #, python-format
++ msgid "(%u days)"
++-msgstr ""
+++msgstr "(%u ਦਿਨ)"
++
++ #: ../output.py:1756
++ msgid "End time :"
++@@ -1116,7 +1116,7 @@ msgstr "ਅਧੂਰਾ ਛੱਡਿਆ"
++
++ #: ../output.py:1773
++ msgid "Failures:"
++-msgstr ""
+++msgstr "ਫੇਲ੍ਹ:"
++
++ #: ../output.py:1777
++ msgid "Failure:"
++@@ -1245,7 +1245,7 @@ msgstr "ਇੰਸਟਾਲ ਕੀਤੇ"
++
++ #: ../output.py:2107
++ msgid "an update"
++-msgstr ""
+++msgstr "ਇੱਕ ਅੱਪਡੇਟ"
++
++ #: ../output.py:2108
++ msgid "erased"
++@@ -1257,11 +1257,11 @@ msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕੀਤੇ"
++
++ #: ../output.py:2110
++ msgid "a downgrade"
++-msgstr ""
+++msgstr "ਡਾਊਨਗਰੇਡ"
++
++ #: ../output.py:2111
++ msgid "obsoleting"
++-msgstr ""
+++msgstr "ਬਰਤਰਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
++
++ #: ../output.py:2112
++ msgid "updated"
++@@ -1274,7 +1274,7 @@ msgstr "ਬਰਤਰਫ਼ ਕੀਤੇ"
++ #: ../output.py:2117
++ #, python-format
++ msgid "---> Package %s.%s %s:%s-%s will be %s"
++-msgstr ""
+++msgstr "---> ਪੈਕੇਜ %s.%s %s:%s-%s ਹੋਵੇਗਾ %s"
++
++ #: ../output.py:2124
++ msgid "--> Running transaction check"
++@@ -1505,7 +1505,7 @@ msgstr "ਮੁਕੰਮਲ!"
++
++ #: ../yumcommands.py:42
++ msgid " Mini usage:\n"
++-msgstr ""
+++msgstr " ਮਿੰਨੀ ਵਰਤੋਂ:\n"
++
++ #: ../yumcommands.py:52
++ msgid "You need to be root to perform this command."
++@@ -1531,7 +1531,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "ਰਿਪੋਜ਼ਟਰੀ ਸਮੱਸਿਆ: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1831,7 +1831,7 @@ msgstr "ਕਦੇ ਨਹੀਂ (ਆਖਰੀ: %s)"
++ #: ../yumcommands.py:1002
++ #, python-format
++ msgid "Instant (last: %s)"
++-msgstr ""
+++msgstr "ਮੌਕਾ (ਪਿਛਲਾ: %s)"
++
++ #: ../yumcommands.py:1005
++ #, python-format
++@@ -1977,7 +1977,7 @@ msgstr ""
++ #: ../yumcommands.py:1522
++ #, python-format
++ msgid "loading transaction from %s"
++-msgstr ""
+++msgstr "%s ਤੋਂ ਟਰਾਂਸੈਕਸ਼ਨ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
++
++ #: ../yumcommands.py:1528
++ #, python-format
++@@ -2009,6 +2009,8 @@ msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
++ #, python-format
++ msgid "Your transaction was saved, rerun it with: yum load-transaction %s"
++ msgstr ""
+++"ਤੁਹਾਡੀ ਟਰਾਂਸੈਕਸ਼ਨ ਸੰਭਾਲੀ ਗਈ ਹੈ, ਇਸ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਚਲਾਉ: yum load-transaction "
+++"%s"
++
++ #: ../yummain.py:288
++ msgid ""
++@@ -2098,12 +2100,12 @@ msgstr ""
++ #: ../yum/depsolve.py:389 ../yum/depsolve.py:406
++ #, python-format
++ msgid "Trying to update %s to resolve dep"
++-msgstr ""
+++msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ %s ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
++
++ #: ../yum/depsolve.py:400 ../yum/depsolve.py:410
++ #, python-format
++ msgid "No update paths found for %s. Failure!"
++-msgstr ""
+++msgstr "%s ਲਈ ਕੋਈ ਅੱਪਡੇਟ ਮਾਰਗ ਨਹੀਂ ਲੱਭਿਆ। ਫੇਲ੍ਹ!"
++
++ #: ../yum/depsolve.py:416
++ #, python-format
++@@ -2123,7 +2125,7 @@ msgstr ""
++ #: ../yum/depsolve.py:440
++ #, python-format
++ msgid "Cannot find an update path for dep for: %s"
++-msgstr ""
+++msgstr "%s: ਲਈ ਨਿਰਭਰਤਾ ਵਾਸਤੇ ਅੱਪਡੇਟ ਮਾਰਗ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਦਾ"
++
++ #: ../yum/depsolve.py:471
++ #, python-format
++@@ -2135,6 +2137,8 @@ msgstr ""
++ #, python-format
++ msgid "%s is in providing packages but it is already installed, removing."
++ msgstr ""
+++"%s ਉਪਲੱਬਧ ਕਰਵਾਉਣ ਵਾਲਿਆ ਪੈਕੇਜਾਂ ਵਿੱਚ ਹੈ, ਪਰ ਇਹ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ, ਹਟਾਇਆ ਜਾ "
+++"ਰਿਹਾ ਹੈ।"
++
++ #: ../yum/depsolve.py:529
++ #, python-format
++@@ -2256,7 +2260,7 @@ msgstr ""
++ #: ../yum/__init__.py:488
++ #, python-format
++ msgid "Repository %r is missing name in configuration, using id"
++-msgstr ""
+++msgstr "ਰਿਪੋਜ਼ਟਰੀ %r ਦਾ ਸੰਰਚਨਾ ਵਿੱਚ ਨਾਂ ਮੌਜੂਦ ਨਹੀਂ ਹੈ, id ਵਰਤੋਂ ਨਾਲ"
++
++ #: ../yum/__init__.py:526
++ msgid "plugins already initialised"
++@@ -2333,7 +2337,7 @@ msgstr "ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਟੈਗ ਸ਼ਾਮਲ ਕੀ
++ #: ../yum/__init__.py:866
++ #, python-format
++ msgid "Failed to add Pkg Tags for repository: %s - %s"
++-msgstr ""
+++msgstr "ਰਿਪੋਜ਼ਟਰੀ ਲਈ Pkg ਟੈਗ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ: %s - %s"
++
++ #: ../yum/__init__.py:944
++ msgid "Importing additional filelist information"
++@@ -2441,7 +2445,7 @@ msgstr "%s ਲਾਕ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s
++ #: ../yum/__init__.py:1785
++ #, 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
++@@ -2609,12 +2613,12 @@ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ %s ਨਾਂ ਦਾ ਕੋਈ ਪੈ
++ #: ../yum/__init__.py:2941
++ #, python-format
++ msgid "Warning: Group %s does not have any packages."
++-msgstr ""
+++msgstr "ਸਾਵਧਾਨ: %s ਗਰੁੱਪ ਵਿੱਚ ਕੋਈ ਵੀ ਪੈਕੇਜ ਨਹੀਂ ਹੈ।"
++
++ #: ../yum/__init__.py:2943
++ #, python-format
++ msgid "Group %s does have %u conditional packages, which may get installed."
++-msgstr ""
+++msgstr "ਗਰੁੱਪ %s ਵਿੱਚ %u ਲਾਜ਼ਮੀ ਪੈਕੇਜ ਹਨ, ਜੋ ਕਿ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ।"
++
++ #. This can happen due to excludes after .up has
++ #. happened.
++@@ -2787,6 +2791,8 @@ msgid ""
++ "Package %s.%s not installed, cannot update it. Run yum install to install it"
++ " instead."
++ msgstr ""
+++"ਪੈਕੇਜ %s.%s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ, ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦਾ। ਇਸ ਦੀ ਬਜਾਏ ਪਹਿਲਾਂ yum "
+++"install ਚਲਾਉ।"
++
++ #: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234
++ #, python-format
++@@ -2849,7 +2855,7 @@ msgstr "ਡਾਊਨਗਰੇਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s"
++ #: ../yum/__init__.py:4516
++ #, python-format
++ msgid "Retrieving key from %s"
++-msgstr ""
+++msgstr "%s ਤੋਂ ਕੁੰਜੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
++
++ #: ../yum/__init__.py:4534
++ msgid "GPG key retrieval failed: "
++@@ -2884,6 +2890,10 @@ msgid ""
++ " Package: %s (%s)\n"
++ " From : %s"
++ msgstr ""
+++"%s ਕੁੰਜੀ 0x%s ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ:\n"
+++" Userid : %s\n"
+++" ਪੈਕੇਜ: %s (%s)\n"
+++" ਤੋਂ : %s"
++
++ #: ../yum/__init__.py:4600
++ #, python-format
++@@ -2892,11 +2902,14 @@ msgid ""
++ " Userid: \"%s\"\n"
++ " From : %s"
++ msgstr ""
+++"%s ਕੁੰਜੀ 0x%s ਇੰਪੋਰਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ:\n"
+++" Userid: \"%s\"\n"
+++" ਤੋਂ : %s"
++
++ #: ../yum/__init__.py:4634
++ #, python-format
++ msgid "GPG key at %s (0x%s) is already installed"
++-msgstr ""
+++msgstr "GPG ਕੁੰਜੀ %s (0x%s) ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ"
++
++ #: ../yum/__init__.py:4671
++ #, python-format
++@@ -2909,7 +2922,7 @@ msgstr "ਕੁੰਜੀ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਪੋਰਟ ਕੀ
++
++ #: ../yum/__init__.py:4676
++ msgid "Didn't install any keys"
++-msgstr ""
+++msgstr "ਕੋਈ ਵੀ ਕੁੰਜੀ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੀ"
++
++ #: ../yum/__init__.py:4680
++ #, python-format
++@@ -2925,7 +2938,7 @@ msgstr ""
++ #: ../yum/__init__.py:4713
++ #, python-format
++ msgid "GPG key at %s (0x%s) is already imported"
++-msgstr ""
+++msgstr "GPG ਕੁੰਜੀ %s (0x%s) ਨੂੰ ਪਹਿਲਾਂ ਹੀ ਇੰਪੋਰਟ ਕੀਤਾ ਗਿਆ ਹੈ"
++
++ #: ../yum/__init__.py:4754
++ msgid "Key import failed"
++@@ -2934,7 +2947,7 @@ msgstr "ਕੁੰਜੀ ਇੰਪੋਰਟ ਫੇਲ੍ਹ"
++ #: ../yum/__init__.py:4770
++ #, python-format
++ msgid "Didn't install any keys for repo %s"
++-msgstr ""
+++msgstr "%s ਰੈਪੋ ਲਈ ਕੋਈ ਵੀ ਕੁੰਜੀਆਂ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
++
++ #: ../yum/__init__.py:4774
++ #, python-format
++@@ -2972,7 +2985,7 @@ msgstr ""
++ #: ../yum/__init__.py:5179 ../yum/__init__.py:5181
++ #, python-format
++ msgid "Could not save transaction file %s: %s"
++-msgstr ""
+++msgstr "ਟਰਾਂਸੈਕਸ਼ਨ ਫਾਇਲ %s ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
++
++ #: ../yum/__init__.py:5195
++ #, python-format
++@@ -2985,11 +2998,11 @@ msgstr ""
++
++ #: ../yum/__init__.py:5216
++ msgid " ignoring, as requested."
++-msgstr ""
+++msgstr " ਕੀਤੀ ਮੰਗ ਮੁਤਾਬਕ ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
++
++ #: ../yum/__init__.py:5219 ../yum/__init__.py:5354
++ msgid " aborting."
++-msgstr ""
+++msgstr "ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"
++
++ #: ../yum/__init__.py:5228
++ msgid "cannot find tsflags or tsflags not integer."
++@@ -3096,7 +3109,7 @@ msgstr "%s ਨੂੰ %s ਨਾਲ ਬਦਲਿਆ ਜਾਂਦਾ ਹੈ"
++ #: ../yum/rpmsack.py:176
++ #, python-format
++ msgid "%s provides %s but it cannot be found"
++-msgstr ""
+++msgstr "%s %s ਦਿੰਦਾ ਹੈ, ਪਰ ਇਹ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
++
++ #: ../yum/rpmtrans.py:80
++ msgid "Repackaging"
++diff --git a/po/pl.po b/po/pl.po
++index 0fe83a9..42699c5 100644
++--- a/po/pl.po
+++++ b/po/pl.po
++@@ -2,14 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Piotr Drąg <piotrdrag at gmail.com>, 2011
+++# Piotr Drąg <piotrdrag at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-06-06 15:10+0000\n"
+++"Last-Translator: raven <piotrdrag at gmail.com>\n"
++ "Language-Team: Polish (http://www.transifex.net/projects/p/yum/team/pl/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -859,7 +859,7 @@ msgstr "Nie zainstalowano"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Niedostępne"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1558,7 +1558,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Problemowe repozytorium: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1885,7 +1885,7 @@ msgstr "Wykluczenia z repozytorium : "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Nazwa pliku repozytorium: "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++diff --git a/po/pt_BR.po b/po/pt_BR.po
++index 493f090..94e2da6 100644
++--- a/po/pt_BR.po
+++++ b/po/pt_BR.po
++@@ -2,14 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# ufa <ufa at technotroll.org>, 2011
+++# ufa <ufa at technotroll.org>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-08-06 18:09+0000\n"
+++"Last-Translator: thiagopeixoto <thiagolcpeixoto at gmail.com>\n"
++ "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/yum/team/pt_BR/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -158,7 +158,7 @@ msgstr "Erro ao baixar pacotes:\n"
++
++ #: ../cli.py:525 ../yum/__init__.py:4967
++ msgid "Running Transaction Check"
++-msgstr ""
+++msgstr "Executando Verificação da Transação"
++
++ #: ../cli.py:534 ../yum/__init__.py:4976
++ msgid "ERROR You need to update rpm to handle:"
++@@ -360,7 +360,7 @@ msgstr "Grupos instalados:"
++
++ #: ../cli.py:1270
++ msgid "Installed Language Groups:"
++-msgstr ""
+++msgstr "Grupos de Idiomas Instalados:"
++
++ #: ../cli.py:1276
++ msgid "Available Groups:"
++@@ -368,7 +368,7 @@ msgstr "Grupos disponíveis:"
++
++ #: ../cli.py:1282
++ msgid "Available Language Groups:"
++-msgstr ""
+++msgstr "Grupos de Idiomas Disponíveis:"
++
++ #: ../cli.py:1285
++ msgid "Done"
++@@ -449,7 +449,7 @@ msgstr "--color aceita uma destas opções: auto, always, never"
++ #: ../cli.py:1596
++ #, python-format
++ msgid "--installroot must be an absolute path: %s"
++-msgstr ""
+++msgstr "--installroot deve ser um caminho absoluto: %s"
++
++ #: ../cli.py:1642
++ msgid "show this help message and exit"
++@@ -743,7 +743,7 @@ msgstr " Descrição: %s"
++ #: ../output.py:788
++ #, python-format
++ msgid " Language: %s"
++-msgstr ""
+++msgstr " Linguagem: %s"
++
++ #: ../output.py:790
++ msgid " Mandatory Packages:"
++@@ -850,7 +850,7 @@ msgstr "Não instalado"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Não disponível"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1004,7 +1004,7 @@ msgstr ""
++
++ #: ../output.py:1421 ../output.py:1592
++ msgid "No transactions"
++-msgstr ""
+++msgstr "Nenhuma transação"
++
++ #: ../output.py:1446 ../output.py:2013
++ msgid "Bad transaction IDs, or package(s), given"
++@@ -1012,7 +1012,7 @@ msgstr "IDs de transação ou pacote(s) fornecido(s) inválido(s)"
++
++ #: ../output.py:1484
++ msgid "Command line"
++-msgstr ""
+++msgstr "Linha de comando"
++
++ #: ../output.py:1486 ../output.py:1908
++ msgid "Login user"
++@@ -1082,22 +1082,22 @@ msgstr "Início do rpmdb:"
++ #: ../output.py:1749
++ #, python-format
++ msgid "(%u seconds)"
++-msgstr ""
+++msgstr "(%u segundos)"
++
++ #: ../output.py:1751
++ #, python-format
++ msgid "(%u minutes)"
++-msgstr ""
+++msgstr "(%u minutos)"
++
++ #: ../output.py:1753
++ #, python-format
++ msgid "(%u hours)"
++-msgstr ""
+++msgstr "(%u horas)"
++
++ #: ../output.py:1755
++ #, python-format
++ msgid "(%u days)"
++-msgstr ""
+++msgstr "(%u dias)"
++
++ #: ../output.py:1756
++ msgid "End time :"
++@@ -1122,7 +1122,7 @@ msgstr "Interrompido"
++
++ #: ../output.py:1773
++ msgid "Failures:"
++-msgstr ""
+++msgstr "Falhas:"
++
++ #: ../output.py:1777
++ msgid "Failure:"
++@@ -1251,7 +1251,7 @@ msgstr "instalado"
++
++ #: ../output.py:2107
++ msgid "an update"
++-msgstr ""
+++msgstr "uma atualização"
++
++ #: ../output.py:2108
++ msgid "erased"
++@@ -1267,7 +1267,7 @@ msgstr ""
++
++ #: ../output.py:2111
++ msgid "obsoleting"
++-msgstr ""
+++msgstr "obsoleto"
++
++ #: ../output.py:2112
++ msgid "updated"
++@@ -1280,7 +1280,7 @@ msgstr "obsoleto"
++ #: ../output.py:2117
++ #, 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
++ msgid "--> Running transaction check"
++@@ -1551,7 +1551,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Repositório problema: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1994,12 +1994,12 @@ msgstr ""
++
++ #: ../yumcommands.py:1518
++ msgid "No saved transaction file specified."
++-msgstr ""
+++msgstr "Nenhum arquivo de transação salvo especificado."
++
++ #: ../yumcommands.py:1522
++ #, python-format
++ msgid "loading transaction from %s"
++-msgstr ""
+++msgstr "carregando transação de %s"
++
++ #: ../yumcommands.py:1528
++ #, python-format
++@@ -2010,7 +2010,7 @@ msgstr ""
++ #: ../yummain.py:84
++ #, python-format
++ msgid " Yum checks failed: %s"
++-msgstr ""
+++msgstr "A verificação do yum falhou: %s"
++
++ #: ../yummain.py:114
++ msgid ""
++@@ -2021,7 +2021,7 @@ msgstr ""
++
++ #: ../yummain.py:120
++ msgid "Can't create lock file; exiting"
++-msgstr ""
+++msgstr "Não é possível criar o arquivo de bloqueio; saindo"
++
++ #. Depsolve stage
++ #: ../yummain.py:167
++@@ -2122,7 +2122,7 @@ msgstr "Modo para o pacote que fornece o %s: %s"
++ #: ../yum/depsolve.py:389 ../yum/depsolve.py:406
++ #, 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
++ #, python-format
++@@ -2826,6 +2826,8 @@ 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."
++
++ #: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234
++ #, python-format
++@@ -2888,7 +2890,7 @@ msgstr "Falha ao desatualizar: %s"
++ #: ../yum/__init__.py:4516
++ #, python-format
++ msgid "Retrieving key from %s"
++-msgstr ""
+++msgstr "Recuperando chave de %s"
++
++ #: ../yum/__init__.py:4534
++ msgid "GPG key retrieval failed: "
++@@ -2948,7 +2950,7 @@ msgstr "Chave importada com sucesso"
++
++ #: ../yum/__init__.py:4676
++ msgid "Didn't install any keys"
++-msgstr ""
+++msgstr "Não instalar nenhuma das chaves"
++
++ #: ../yum/__init__.py:4680
++ #, python-format
++@@ -2975,7 +2977,7 @@ msgstr "Falha na importação da chave"
++ #: ../yum/__init__.py:4770
++ #, 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
++ #, python-format
++@@ -3011,16 +3013,17 @@ msgstr "Não foi possível definir a cachedir: %s"
++ #: ../yum/__init__.py:5148 ../yum/__init__.py:5150
++ 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."
++
++ #: ../yum/__init__.py:5179 ../yum/__init__.py:5181
++ #, 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
++ #, 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
++ msgid "rpmdb ver mismatched saved transaction version, "
++@@ -3028,11 +3031,11 @@ msgstr ""
++
++ #: ../yum/__init__.py:5216
++ msgid " ignoring, as requested."
++-msgstr ""
+++msgstr "ignorando, conforme solicitado."
++
++ #: ../yum/__init__.py:5219 ../yum/__init__.py:5354
++ msgid " aborting."
++-msgstr ""
+++msgstr "abortando."
++
++ #: ../yum/__init__.py:5228
++ msgid "cannot find tsflags or tsflags not integer."
diff --git a/po/pygettext.py b/po/pygettext.py
index 276a433..7f13138 100644
--- a/po/pygettext.py
@@@ -3440,6 -3438,6 +7800,641 @@@
# Originally written by Barry Warsaw <bwarsaw at python.org>
#
# minimally patched to make it even more xgettext compatible
++diff --git a/po/ru.po b/po/ru.po
++index 52ba58b..a94c27b 100644
++--- a/po/ru.po
+++++ b/po/ru.po
++@@ -2,15 +2,15 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Misha Shnurapet <shnurapet AT fedoraproject.org>, 2011
++-# Misha Shnurapet <shnurapet at fedoraproject.org>, 2011
+++# Misha Shnurapet <shnurapet AT fedoraproject.org>, 2011.
+++# Misha Shnurapet <shnurapet at fedoraproject.org>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-06-07 09:13+0000\n"
+++"Last-Translator: shnurapet <shnurapet at fedoraproject.org>\n"
++ "Language-Team: Russian (http://www.transifex.net/projects/p/yum/team/ru/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -283,16 +283,16 @@ msgstr "Совпадений: %s"
++ #, python-format
++ msgid " Name and summary matches %sonly%s, use \"search all\" for everything."
++ msgstr ""
++-" Название и описание совпадают только с %sonly%s, используйте «search all»,"
++-" чтобы искать везде."
+++" Показаны %sтолько%s совпадения по названиям и описаниям, для большего "
+++"используйте «search all»."
++
++ #: ../cli.py:1077
++ #, python-format
++ msgid ""
++ " Full name and summary matches %sonly%s, use \"search all\" for everything."
++ msgstr ""
++-" Полное название и описание совпадают только с %sonly%s, используйте "
++-"«search all», чтобы искать везде."
+++" Показаны %sтолько%s полные совпадения по названиям и описаниям, для "
+++"большего используйте «search all»."
++
++ #: ../cli.py:1095
++ #, python-format
++@@ -303,8 +303,8 @@ msgstr "Совпадений: %s"
++ #, python-format
++ msgid " Name and summary matches %smostly%s, use \"search all\" for everything."
++ msgstr ""
++-" Название и описание совпадают с %smostly%s, используйте «search all», "
++-"чтобы искать везде."
+++" Показаны %sв основном%s совпадения по названияю и описанию, для большего "
+++"используйте «search all»."
++
++ #: ../cli.py:1106
++ #, python-format
++@@ -857,7 +857,7 @@ msgstr "Не установлено"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Недоступно"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1554,7 +1554,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Проблема с репозиторием: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1885,7 +1885,7 @@ msgstr "Исключено из репозитория : "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Файл репозитория:"
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++diff --git a/po/sv.po b/po/sv.po
++index b9c109b..95b1345 100644
++--- a/po/sv.po
+++++ b/po/sv.po
++@@ -2,7 +2,7 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Göran Uddeborg <goeran at uddeborg.se>, 2011
+++# Göran Uddeborg <goeran at uddeborg.se>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\n"
++diff --git a/po/uk.po b/po/uk.po
++index f5a658d..7751c57 100644
++--- a/po/uk.po
+++++ b/po/uk.po
++@@ -2,14 +2,14 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Yuri Chornoivan <yurchor at ukr.net>, 2011
+++# Yuri Chornoivan <yurchor at ukr.net>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-06-07 16:46+0000\n"
+++"Last-Translator: yurchor <yurchor at ukr.net>\n"
++ "Language-Team: Ukrainian (http://www.transifex.net/projects/p/yum/team/uk/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -858,7 +858,7 @@ msgstr "Не встановлено"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "Недоступний"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -1559,7 +1559,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "Проблема зі сховищем: %s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1889,7 +1889,7 @@ msgstr "Виключені сховища: "
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "Назва файла сховища: "
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++diff --git a/po/zh_CN.po b/po/zh_CN.po
++index 9fe1a5c..41cde9b 100644
++--- a/po/zh_CN.po
+++++ b/po/zh_CN.po
++@@ -2,15 +2,15 @@
++ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++ # This file is distributed under the same license as the PACKAGE package.
++ #
++-# Mike Ma <zhtx10 at gmail.com>, 2011
++-# lovenemesis <lovenemesis at gmail.com>, 2011
+++# Mike Ma <zhtx10 at gmail.com>, 2011.
+++# lovenemesis <lovenemesis at gmail.com>, 2011.
++ msgid ""
++ msgstr ""
++ "Project-Id-Version: Yum\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 <skvidal at fedoraproject.org>\n"
+++"PO-Revision-Date: 2011-07-17 05:22+0000\n"
+++"Last-Translator: ekd123 <zhtx10 at gmail.com>\n"
++ "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/yum/team/zh_CN/)\n"
++ "MIME-Version: 1.0\n"
++ "Content-Type: text/plain; charset=UTF-8\n"
++@@ -159,7 +159,7 @@ msgstr "下载软件包出错：\n"
++
++ #: ../cli.py:525 ../yum/__init__.py:4967
++ msgid "Running Transaction Check"
++-msgstr ""
+++msgstr "运行事务检查"
++
++ #: ../cli.py:534 ../yum/__init__.py:4976
++ msgid "ERROR You need to update rpm to handle:"
++@@ -167,7 +167,7 @@ msgstr "错误：您需要更新 rpm 以处理："
++
++ #: ../cli.py:536 ../yum/__init__.py:4979
++ msgid "ERROR with transaction check vs depsolve:"
++-msgstr ""
+++msgstr "事务检查与依赖解决错误："
++
++ #: ../cli.py:542
++ msgid "RPM needs to be updated"
++@@ -277,18 +277,18 @@ msgstr "未指定软件包"
++ #: ../cli.py:1058
++ #, python-format
++ msgid "N/S Matched: %s"
++-msgstr ""
+++msgstr "N/S 匹配：%s"
++
++ #: ../cli.py:1075
++ #, python-format
++ msgid " Name and summary matches %sonly%s, use \"search all\" for everything."
++-msgstr ""
+++msgstr " 名称和简介匹配 %sonly%s，使用“search all”试试。"
++
++ #: ../cli.py:1077
++ #, python-format
++ msgid ""
++ " Full name and summary matches %sonly%s, use \"search all\" for everything."
++-msgstr ""
+++msgstr " 全名和简介匹配 %sonly%s，使用“search all”试试。"
++
++ #: ../cli.py:1095
++ #, python-format
++@@ -298,7 +298,7 @@ msgstr "匹配：%s"
++ #: ../cli.py:1102
++ #, python-format
++ msgid " Name and summary matches %smostly%s, use \"search all\" for everything."
++-msgstr ""
+++msgstr " 名称和简介匹配 %smonstly%s，使用“search all”试试。"
++
++ #: ../cli.py:1106
++ #, python-format
++@@ -353,7 +353,7 @@ msgstr "清理插件"
++ #: ../cli.py:1247
++ #, python-format
++ msgid "Warning: No groups match: %s"
++-msgstr ""
+++msgstr "警告：无组匹配：%s"
++
++ #: ../cli.py:1264
++ msgid "Installed Groups:"
++@@ -361,7 +361,7 @@ msgstr "已安装的组："
++
++ #: ../cli.py:1270
++ msgid "Installed Language Groups:"
++-msgstr ""
+++msgstr "安装了的语言组："
++
++ #: ../cli.py:1276
++ msgid "Available Groups:"
++@@ -369,7 +369,7 @@ msgstr "有效的组:"
++
++ #: ../cli.py:1282
++ msgid "Available Language Groups:"
++-msgstr ""
+++msgstr "可用语言组："
++
++ #: ../cli.py:1285
++ msgid "Done"
++@@ -447,7 +447,7 @@ msgstr "--color 需要参数：auto, always, never"
++ #: ../cli.py:1596
++ #, python-format
++ msgid "--installroot must be an absolute path: %s"
++-msgstr ""
+++msgstr "-- 安装根必须是绝对路径：%s"
++
++ #: ../cli.py:1642
++ msgid "show this help message and exit"
++@@ -738,7 +738,7 @@ msgstr " 描述：%s"
++ #: ../output.py:788
++ #, python-format
++ msgid " Language: %s"
++-msgstr ""
+++msgstr " 语言：%s"
++
++ #: ../output.py:790
++ msgid " Mandatory Packages:"
++@@ -845,7 +845,7 @@ msgstr "未安装"
++
++ #: ../output.py:1053
++ msgid "Not available"
++-msgstr ""
+++msgstr "不可用"
++
++ #: ../output.py:1075 ../output.py:2024
++ msgid "Package"
++@@ -995,11 +995,11 @@ msgstr "系统"
++ #: ../output.py:1411
++ #, python-format
++ msgid "Skipping merged transaction %d to %d, as it overlaps"
++-msgstr ""
+++msgstr "跳过合并事务 %d 到 %d，因为它俩重叠"
++
++ #: ../output.py:1421 ../output.py:1592
++ msgid "No transactions"
++-msgstr ""
+++msgstr "没有事务"
++
++ #: ../output.py:1446 ../output.py:2013
++ msgid "Bad transaction IDs, or package(s), given"
++@@ -1007,7 +1007,7 @@ msgstr "错误的事务 ID 或软件包"
++
++ #: ../output.py:1484
++ msgid "Command line"
++-msgstr ""
+++msgstr "命令行"
++
++ #: ../output.py:1486 ../output.py:1908
++ msgid "Login user"
++@@ -1077,22 +1077,22 @@ msgstr "启动 rpmdb ："
++ #: ../output.py:1749
++ #, python-format
++ msgid "(%u seconds)"
++-msgstr ""
+++msgstr "（%u 秒）"
++
++ #: ../output.py:1751
++ #, python-format
++ msgid "(%u minutes)"
++-msgstr ""
+++msgstr "（%u 分钟）"
++
++ #: ../output.py:1753
++ #, python-format
++ msgid "(%u hours)"
++-msgstr ""
+++msgstr "（%u 小时）"
++
++ #: ../output.py:1755
++ #, python-format
++ msgid "(%u days)"
++-msgstr ""
+++msgstr "（%u 天）"
++
++ #: ../output.py:1756
++ msgid "End time :"
++@@ -1117,7 +1117,7 @@ msgstr "已终止"
++
++ #: ../output.py:1773
++ msgid "Failures:"
++-msgstr ""
+++msgstr "失败："
++
++ #: ../output.py:1777
++ msgid "Failure:"
++@@ -1246,7 +1246,7 @@ msgstr "安装"
++
++ #: ../output.py:2107
++ msgid "an update"
++-msgstr ""
+++msgstr "一个更新"
++
++ #: ../output.py:2108
++ msgid "erased"
++@@ -1258,11 +1258,11 @@ msgstr "已重新安装"
++
++ #: ../output.py:2110
++ msgid "a downgrade"
++-msgstr ""
+++msgstr "一个降级"
++
++ #: ../output.py:2111
++ msgid "obsoleting"
++-msgstr ""
+++msgstr "舍弃"
++
++ #: ../output.py:2112
++ msgid "updated"
++@@ -1275,7 +1275,7 @@ msgstr "取代"
++ #: ../output.py:2117
++ #, python-format
++ msgid "---> Package %s.%s %s:%s-%s will be %s"
++-msgstr ""
+++msgstr "---> 软件包 %s.%s.%s.%s-%s 将被 %s"
++
++ #: ../output.py:2124
++ msgid "--> Running transaction check"
++@@ -1502,7 +1502,7 @@ msgstr "完毕！"
++
++ #: ../yumcommands.py:42
++ msgid " Mini usage:\n"
++-msgstr ""
+++msgstr " 迷你用法：\n"
++
++ #: ../yumcommands.py:52
++ msgid "You need to be root to perform this command."
++@@ -1536,7 +1536,7 @@ msgstr ""
++ #: ../yumcommands.py:74
++ #, python-format
++ msgid "Problem repository: %s"
++-msgstr ""
+++msgstr "问题仓库：%s"
++
++ #: ../yumcommands.py:80
++ #, python-format
++@@ -1863,7 +1863,7 @@ msgstr "仓库除外："
++
++ #: ../yumcommands.py:1022
++ msgid "Repo-filename: "
++-msgstr ""
+++msgstr "仓库文件名："
++
++ #. Work out the first (id) and last (enabled/disalbed/count),
++ #. then chop the middle (name)...
++@@ -1975,27 +1975,27 @@ msgstr "检查rpmdb里的问题"
++
++ #: ../yumcommands.py:1514
++ msgid "load a saved transaction from filename"
++-msgstr ""
+++msgstr "从文件名中加载一个已存事务"
++
++ #: ../yumcommands.py:1518
++ msgid "No saved transaction file specified."
++-msgstr ""
+++msgstr "指定文件中没有已存事务。"
++
++ #: ../yumcommands.py:1522
++ #, python-format
++ msgid "loading transaction from %s"
++-msgstr ""
+++msgstr "正在从 %s 中加载事务"
++
++ #: ../yumcommands.py:1528
++ #, python-format
++ msgid "Transaction loaded from %s with %s members"
++-msgstr ""
+++msgstr "事务从 %s 载入，还有 %s 成员。"
++
++ #. This is mainly for PackageSackError from rpmdb.
++ #: ../yummain.py:84
++ #, python-format
++ msgid " Yum checks failed: %s"
++-msgstr ""
+++msgstr " Yum 检查失败：%s"
++
++ #: ../yummain.py:114
++ msgid ""
++@@ -2004,7 +2004,7 @@ msgstr "另外一个程序锁定了 yum；等待它退出……"
++
++ #: ../yummain.py:120
++ msgid "Can't create lock file; exiting"
++-msgstr ""
+++msgstr "不能创建锁文件，退出"
++
++ #. Depsolve stage
++ #: ../yummain.py:167
++@@ -2014,7 +2014,7 @@ msgstr "解决依赖关系"
++ #: ../yummain.py:230
++ #, python-format
++ msgid "Your transaction was saved, rerun it with: yum load-transaction %s"
++-msgstr ""
+++msgstr "您的事务已保存，用 yum load-transaction %s 打开。"
++
++ #: ../yummain.py:288
++ msgid ""
++@@ -2104,12 +2104,12 @@ msgstr "提供 %s 的软件包使用的模式：%s"
++ #: ../yum/depsolve.py:389 ../yum/depsolve.py:406
++ #, python-format
++ msgid "Trying to update %s to resolve dep"
++-msgstr ""
+++msgstr "尝试升级 %s 来解决依赖"
++
++ #: ../yum/depsolve.py:400 ../yum/depsolve.py:410
++ #, python-format
++ msgid "No update paths found for %s. Failure!"
++-msgstr ""
+++msgstr "未为 %s 找到更新路径。失败！"
++
++ #: ../yum/depsolve.py:416
++ #, python-format
++@@ -2360,12 +2360,12 @@ msgstr "存在未完成的操作。您或许需要先运行 yum-complete-transac
++
++ #: ../yum/__init__.py:983
++ msgid "--> Finding unneeded leftover dependencies"
++-msgstr ""
+++msgstr "--> 找到剩下的不需要的依赖"
++
++ #: ../yum/__init__.py:1041
++ #, python-format
++ msgid "Protected multilib versions: %s != %s"
++-msgstr ""
+++msgstr "保护多库版本：%s != %s"
++
++ #: ../yum/__init__.py:1096
++ #, python-format
++@@ -2613,12 +2613,12 @@ msgstr "找不到名为 %s 的软件包来安装"
++ #: ../yum/__init__.py:2941
++ #, python-format
++ msgid "Warning: Group %s does not have any packages."
++-msgstr ""
+++msgstr "警告：%s 组不包含任何包。"
++
++ #: ../yum/__init__.py:2943
++ #, python-format
++ msgid "Group %s does have %u conditional packages, which may get installed."
++-msgstr ""
+++msgstr "组 %s 拥有 %u 有条件的包可能安装。"
++
++ #. This can happen due to excludes after .up has
++ #. happened.
++@@ -2635,7 +2635,7 @@ msgstr "rpmdb 中找不到软件包元组 %s"
++ #: ../yum/__init__.py:3079 ../yum/__init__.py:3129
++ #, python-format
++ msgid "Invalid version flag from: %s"
++-msgstr ""
+++msgstr "来自 %s 的无效版本标志"
++
++ #: ../yum/__init__.py:3096 ../yum/__init__.py:3101
++ #, python-format
++@@ -2785,7 +2785,7 @@ msgstr "软件包 %s 没有安装，不能更新。运行 yum install 安装它
++ msgid ""
++ "Package %s.%s not installed, cannot update it. Run yum install to install it"
++ " instead."
++-msgstr ""
+++msgstr "软件包 %s.%s 未安装，不能更新它。替代方案是运行 yum install 安装。"
++
++ #: ../yum/__init__.py:4094 ../yum/__init__.py:4158 ../yum/__init__.py:4234
++ #, python-format
++@@ -2848,7 +2848,7 @@ msgstr "降级失败：%s"
++ #: ../yum/__init__.py:4516
++ #, python-format
++ msgid "Retrieving key from %s"
++-msgstr ""
+++msgstr "从 %s 检索密钥"
++
++ #: ../yum/__init__.py:4534
++ msgid "GPG key retrieval failed: "
++@@ -2859,11 +2859,11 @@ msgstr "获取 GPG 密钥失败："
++ #: ../yum/__init__.py:4557
++ #, 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
++ msgid "GPG key signature verified against CA Key(s)"
++-msgstr ""
+++msgstr "GPG 密钥签名验证与 CA 密钥冲突"
++
++ #: ../yum/__init__.py:4567
++ #, python-format
++@@ -2883,6 +2883,10 @@ msgid ""
++ " Package: %s (%s)\n"
++ " From : %s"
++ msgstr ""
+++"导入 %s 键 0x%s：\n"
+++" 用户ID：%s\n"
+++" 软件包：%s（%s）\n"
+++" 来自 ：%s"
++
++ #: ../yum/__init__.py:4600
++ #, python-format
++@@ -2891,6 +2895,9 @@ msgid ""
++ " Userid: \"%s\"\n"
++ " From : %s"
++ msgstr ""
+++"导入 %s 键 0x%s：\n"
+++" 用户ID：“%s”\n"
+++" 来自 ：%s"
++
++ #: ../yum/__init__.py:4634
++ #, python-format
++@@ -2908,7 +2915,7 @@ msgstr "导入密钥成功"
++
++ #: ../yum/__init__.py:4676
++ msgid "Didn't install any keys"
++-msgstr ""
+++msgstr "没有安装任何键"
++
++ #: ../yum/__init__.py:4680
++ #, python-format
++@@ -2933,7 +2940,7 @@ msgstr "导入密钥失败"
++ #: ../yum/__init__.py:4770
++ #, python-format
++ msgid "Didn't install any keys for repo %s"
++-msgstr ""
+++msgstr "没有对 %s 仓库安装任何键"
++
++ #: ../yum/__init__.py:4774
++ #, python-format
++@@ -2968,56 +2975,56 @@ msgstr "不能置缓存目录：%s"
++
++ #: ../yum/__init__.py:5148 ../yum/__init__.py:5150
++ msgid "Dependencies not solved. Will not save unresolved transaction."
++-msgstr ""
+++msgstr "依赖没有解决。将不会保存未解决事务。"
++
++ #: ../yum/__init__.py:5179 ../yum/__init__.py:5181
++ #, python-format
++ msgid "Could not save transaction file %s: %s"
++-msgstr ""
+++msgstr "不能保存事务文件 %s：%s"
++
++ #: ../yum/__init__.py:5195
++ #, python-format
++ msgid "Could not access/read saved transaction %s : %s"
++-msgstr ""
+++msgstr "不能访问或都去已存事务 %s：%s"
++
++ #: ../yum/__init__.py:5214
++ msgid "rpmdb ver mismatched saved transaction version, "
++-msgstr ""
+++msgstr "RPM数据库版本与已存事务版本不匹配， "
++
++ #: ../yum/__init__.py:5216
++ msgid " ignoring, as requested."
++-msgstr ""
+++msgstr " 忽略，作为请求。"
++
++ #: ../yum/__init__.py:5219 ../yum/__init__.py:5354
++ msgid " aborting."
++-msgstr ""
+++msgstr " 终止。"
++
++ #: ../yum/__init__.py:5228
++ msgid "cannot find tsflags or tsflags not integer."
++-msgstr ""
+++msgstr "不能找到 tsflags 或 tsflags 非整数。"
++
++ #: ../yum/__init__.py:5267
++ #, python-format
++ msgid "Found txmbr in unknown current state: %s"
++-msgstr ""
+++msgstr "在未知当前状态找到 txmbr：%s"
++
++ #: ../yum/__init__.py:5271
++ #, python-format
++ msgid "Could not find txmbr: %s in state %s"
++-msgstr ""
+++msgstr "不能找到 txmbr：在 %s 状态中 %s"
++
++ #: ../yum/__init__.py:5307 ../yum/__init__.py:5324
++ #, python-format
++ msgid "Could not find txmbr: %s from origin: %s"
++-msgstr ""
+++msgstr "不能找到 txmbr：来自原地 %s 的 %s"
++
++ #: ../yum/__init__.py:5349
++ msgid "Transaction members, relations are missing or ts has been modified,"
++-msgstr ""
+++msgstr "事务成员、关系缺失或 ts 已被修改，"
++
++ #: ../yum/__init__.py:5351
++ msgid " ignoring, as requested. You must redepsolve!"
++-msgstr ""
+++msgstr " 忽略，作为请求。您必须解决依赖！"
++
++ #. Mostly copied from YumOutput._outKeyValFill()
++ #: ../yum/plugins.py:209
diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 6082005..ad7bbb1 100644
--- a/rpmUtils/arch.py
diff --cc yum.spec
index 19a6758,f7bc652..1753959
--- a/yum.spec
+++ b/yum.spec
@@@ -18,7 -18,7 +18,7 @@@
Summary: RPM package installer/updater/manager
Name: yum
Version: 3.4.3
- Release: 8%{?dist}
-Release: 7%{?dist}
++Release: 9%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://yum.baseurl.org/download/3.4/%{name}-%{version}.tar.gz
@@@ -316,10 -316,6 +316,16 @@@ exit
%endif
%changelog
++* Tue Aug 23 2011 James Antill <james at fedoraproject.org> - 3.4.3-9
++- update to latest HEAD
++- Update translations.
++- Minor UI tweaks for transaction output.
++- Minor tweak for update_reqs_on_install.
++
+* Mon Aug 22 2011 James Antill <james at fedoraproject.org> - 3.4.3-8
+- update to latest HEAD
+- Fix upgrade_requirements_on_install breaking upgrade typos.
+
* Fri Aug 19 2011 James Antill <james at fedoraproject.org> - 3.4.3-7
- update to latest HEAD
- Fix syncing of yum DB data in history.
More information about the scm-commits
mailing list