diff --git a/.gitignore b/.gitignore
index 52ce707..911da19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@
*~
*.bak
*.swp
+*.tar.*
+.project
+.pydevproject
+asthelper.completions
diff --git a/Makefile b/Makefile
index aba6eb2..f1921d0 100644
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,8 @@ _archive:
@rm -rf ${PKGNAME}-%{VERSION}.tar.gz
@rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME}
@dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME}
- lynx -dump 'http://wiki.linux.duke.edu/WritingYumPlugins?action=print' > /tmp/${PKGNAME}/PLUGINS
- lynx -dump 'http://wiki.linux.duke.edu/YumFaq?action=print' > /tmp/${PKGNAME}/FAQ
+ lynx -dump 'http://yum.baseurl.org/wiki/WritingYumPlugins?format=txt' > /tmp/${PKGNAME}/PLUGINS
+ lynx -dump 'http://yum.baseurl.org/wiki/Faq?format=txt' > /tmp/${PKGNAME}/FAQ
@rm -f /tmp/${PKGNAME}/$(remove_spec)
@rm -rf /tmp/${PKGNAME}/.git
@mv /tmp/${PKGNAME} /tmp/${PKGNAME}-$(VERSION)
diff --git a/bin/yum.py b/bin/yum.py
index 112cfad..7ccee31 100755
--- a/bin/yum.py
+++ b/bin/yum.py
@@ -18,7 +18,7 @@ current version of Python, which is:
If you cannot solve this problem yourself, please go to
the yum faq at:
- http://wiki.linux.duke.edu/YumFaq
+ http://yum.baseurl.org/wiki/Faq
""" % (sys.exc_value, sys.version)
sys.exit(1)
diff --git a/cli.py b/cli.py
index b098a9f..f5ed53d 100644
--- a/cli.py
+++ b/cli.py
@@ -99,10 +99,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self.registerCommand(yumcommands.DowngradeCommand())
self.registerCommand(yumcommands.VersionCommand())
self.registerCommand(yumcommands.HistoryCommand())
+ self.registerCommand(yumcommands.CheckRpmdbCommand())
def registerCommand(self, command):
for name in command.getNames():
- if self.yum_cli_commands.has_key(name):
+ if name in self.yum_cli_commands:
raise yum.Errors.ConfigError(_('Command "%s" already defined') % name)
self.yum_cli_commands[name] = command
@@ -138,7 +139,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
"""
usage = 'yum [options] COMMAND\n\nList of Commands:\n\n'
commands = yum.misc.unique(self.yum_cli_commands.values())
- commands.sort(cmp=lambda x,y : cmp(x.getNames()[0], y.getNames()[0]))
+ commands.sort(key=lambda x: x.getNames()[0])
for command in commands:
# XXX Remove this when getSummary is common in plugins
try:
@@ -186,6 +187,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
pc.errorlevel = opts.errorlevel
pc.disabled_plugins = self.optparser._splitArg(opts.disableplugins)
pc.enabled_plugins = self.optparser._splitArg(opts.enableplugins)
+ pc.releasever = opts.releasever
self.conf
except yum.Errors.ConfigError, e:
@@ -209,6 +211,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
done = False
def sm_ui_time(x):
return time.strftime("%Y-%m-%d %H:%M", time.gmtime(x))
+ def sm_ui_date(x): # For changelogs, there is no time
+ return time.strftime("%Y-%m-%d", time.gmtime(x))
for pkg in sorted(self.rpmdb.returnPackages(patterns=yum_progs)):
# We should only have 1 version of each...
if done: print ""
@@ -225,7 +229,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
print _(" Built : %s at %s") % (pkg.packager,
sm_ui_time(pkg.buildtime))
print _(" Committed: %s at %s") % (pkg.committer,
- sm_ui_time(pkg.committime))
+ sm_ui_date(pkg.committime))
sys.exit(0)
if opts.sleeptime is not None:
@@ -276,8 +280,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
for arg in self.extcmds:
self.verbose_logger.log(yum.logginglevels.DEBUG_4, ' %s', arg)
- if not self.yum_cli_commands.has_key(self.basecmd):
- self.usage()
+ if self.basecmd not in self.yum_cli_commands:
+ self.logger.critical(_('No such command: %s. Please use %s --help'),
+ self.basecmd, sys.argv[0])
raise CliError
self.yum_cli_commands[self.basecmd].doCheck(self, self.basecmd, self.extcmds)
@@ -308,7 +313,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if disk:
summary += _('Disk Requirements:\n')
for k in disk:
- summary += _(' At least %dMB needed on the %s filesystem.\n') % (disk[k], k)
+ summary += _(' At least %dMB more space needed on the %s filesystem.\n') % (disk[k], k)
# TODO: simplify the dependency errors?
@@ -372,8 +377,11 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# Check which packages have to be downloaded
downloadpkgs = []
stuff_to_download = False
+ install_only = True
for txmbr in self.tsInfo.getMembers():
- if txmbr.ts_state in ['i', 'u']:
+ if txmbr.ts_state not in ('i', 'u'):
+ install_only = False
+ else:
stuff_to_download = True
po = txmbr.po
if po:
@@ -387,7 +395,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# Report the total download size to the user, so he/she can base
# the answer on this info
if stuff_to_download:
- self.reportDownloadSize(downloadpkgs)
+ self.reportDownloadSize(downloadpkgs, install_only)
# confirm with user
if self._promptWanted():
@@ -453,9 +461,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self.populateTs(keepold=0) # sigh
tserrors = self.ts.test(testcb)
del testcb
-
- self.verbose_logger.log(yum.logginglevels.INFO_2,
- _('Finished Transaction Test'))
+
if len(tserrors) > 0:
errstring = _('Transaction Check Error:\n')
for descr in tserrors:
@@ -589,7 +595,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
oldcount = len(self.tsInfo)
for arg in userlist:
- if arg.endswith('.rpm') and os.path.exists(arg): # this is hurky, deal w/it
+ if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or
+ os.path.exists(arg))):
self.localInstall(filelist=[arg])
continue # it was something on disk and it ended in rpm
# no matter what we don't go looking at repos
@@ -622,7 +629,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# pass them off to localInstall() and then move on
localupdates = []
for item in userlist:
- if item.endswith('.rpm') and os.path.exists(item): # this is hurky, deal w/it
+ if (item.endswith('.rpm') and (yum.misc.re_remote_url(item) or
+ os.path.exists(item))):
localupdates.append(item)
if len(localupdates) > 0:
@@ -666,7 +674,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
oldcount = len(self.tsInfo)
for arg in userlist:
- if arg.endswith('.rpm') and os.path.exists(arg):
+ if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or
+ os.path.exists(arg))):
self.downgradeLocal(arg)
continue # it was something on disk and it ended in rpm
# no matter what we don't go looking at repos
@@ -690,7 +699,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
oldcount = len(self.tsInfo)
for arg in userlist:
- if arg.endswith('.rpm') and os.path.exists(arg):
+ if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or
+ os.path.exists(arg))):
self.reinstallLocal(arg)
continue # it was something on disk and it ended in rpm
# no matter what we don't go looking at repos
@@ -803,7 +813,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if keys != okeys:
if akeys:
print ""
- print self.fmtSection("Matched: " + ", ".join(sorted(keys)))
+ # Print them in the order they were passed
+ used_keys = [arg for arg in args if arg in keys]
+ print self.fmtSection(_('Matched: %s') % ", ".join(used_keys))
okeys = keys
akeys.update(keys)
self.matchcallback(po, matched_value, args)
@@ -822,8 +834,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
pkgs = []
for arg in args:
- if arg.endswith('.rpm') and os.path.exists(arg): # this is hurky, deal w/it
- thispkg = yum.packages.YumLocalPackage(self.ts, arg)
+ if (arg.endswith('.rpm') and (yum.misc.re_remote_url(arg) or
+ os.path.exists(arg))):
+ thispkg = yum.packages.YumUrlPackage(self, self.ts, arg)
pkgs.append(thispkg)
else:
ematch, match, unmatch = self.pkgSack.matchPackageNames([arg])
@@ -885,10 +898,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
hdrcode, hdrresults = self.cleanHeaders()
xmlcode, xmlresults = self.cleanMetadata()
dbcode, dbresults = self.cleanSqlite()
+ rpmcode, rpmresults = self.cleanRpmDB()
self.plugins.run('clean')
- code = hdrcode + pkgcode + xmlcode + dbcode
- results = hdrresults + pkgresults + xmlresults + dbresults
+ code = hdrcode + pkgcode + xmlcode + dbcode + rpmcode
+ results = (hdrresults + pkgresults + xmlresults + dbresults +
+ rpmresults)
for msg in results:
self.logger.debug(msg)
return code, []
@@ -908,6 +923,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if 'expire-cache' in userlist or 'metadata' in userlist:
self.logger.debug(_('Cleaning up expire-cache metadata'))
expccode, expcresults = self.cleanExpireCache()
+ if 'rpmdb' in userlist:
+ self.logger.debug(_('Cleaning up cached rpmdb data'))
+ expccode, expcresults = self.cleanRpmDB()
if 'plugins' in userlist:
self.logger.debug(_('Cleaning up plugins'))
self.plugins.run('clean')
@@ -1131,7 +1149,7 @@ class YumOptionParser(OptionParser):
args = _filtercmdline(
('--noplugins','--version','-q', '-v', "--quiet", "--verbose"),
('-c', '-d', '-e', '--installroot',
- '--disableplugin', '--enableplugin'),
+ '--disableplugin', '--enableplugin', '--releasever'),
args)
except ValueError, arg:
self.base.usage()
@@ -1218,6 +1236,9 @@ class YumOptionParser(OptionParser):
self.base.usage()
sys.exit(1)
+ if opts.rpmverbosity is not None:
+ self.base.conf.rpmverbosity = opts.rpmverbosity
+
# setup the progress bars/callbacks
self.base.setupProgressCallbacks()
# setup the callbacks to import gpg pubkeys and confirm them
@@ -1300,27 +1321,33 @@ class YumOptionParser(OptionParser):
group.add_option("-t", "--tolerant", action="store_true",
help=_("be tolerant of errors"))
- group.add_option("-C", dest="cacheonly", action="store_true",
- help=_("run entirely from cache, don't update cache"))
- group.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
- help=_("config file location"), metavar=' [config file]')
- group.add_option("-R", dest="sleeptime", type='int', default=None,
- help=_("maximum command wait time"), metavar=' [minutes]')
- group.add_option("-d", dest="debuglevel", default=None,
+ group.add_option("-C", "--cacheonly", dest="cacheonly",
+ action="store_true",
+ help=_("run entirely from system cache, don't update cache"))
+ group.add_option("-c", "--config", dest="conffile",
+ default='/etc/yum/yum.conf',
+ help=_("config file location"), metavar='[config file]')
+ group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
+ default=None,
+ help=_("maximum command wait time"), metavar='[minutes]')
+ group.add_option("-d", "--debuglevel", dest="debuglevel", default=None,
help=_("debugging output level"), type='int',
- metavar=' [debug level]')
+ metavar='[debug level]')
group.add_option("--showduplicates", dest="showdupesfromrepos",
action="store_true",
help=_("show duplicates, in repos, in list/search commands"))
- group.add_option("-e", dest="errorlevel", default=None,
+ group.add_option("-e", "--errorlevel", dest="errorlevel", default=None,
help=_("error output level"), type='int',
- metavar=' [error level]')
+ metavar='[error level]')
+ group.add_option("", "--rpmverbosity", default=None,
+ help=_("debugging output level for rpm"),
+ metavar='[debug level name]')
group.add_option("-q", "--quiet", dest="quiet", action="store_true",
help=_("quiet operation"))
group.add_option("-v", "--verbose", dest="verbose", action="store_true",
help=_("verbose operation"))
- group.add_option("-y", dest="assumeyes", action="store_true",
- help=_("answer yes for all questions"))
+ group.add_option("-y", "--assumeyes", dest="assumeyes",
+ action="store_true", help=_("answer yes for all questions"))
group.add_option("--version", action="store_true",
help=_("show Yum version and exit"))
group.add_option("--installroot", help=_("set install root"),
@@ -1354,6 +1381,8 @@ class YumOptionParser(OptionParser):
help=_("skip packages with depsolving problems"))
group.add_option("", "--color", dest="color", default=None,
help=_("control whether color is used"))
+ group.add_option("", "--releasever", dest="releasever", default=None,
+ help=_("set value of $releasever in yum config and repo files"))
diff --git a/docs/yum.8 b/docs/yum.8
index e2fbe3c..8d42d9d 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -35,7 +35,7 @@ gnome\-packagekit application\&.
.br
.I \fR * provides | whatprovides feature1 [feature2] [\&.\&.\&.]
.br
-.I \fR * clean [ packages | headers | metadata | dbcache | all ]
+.I \fR * clean [ packages | metadata | expire-cache | rpmdb | plugins | all ]
.br
.I \fR * makecache
.br
@@ -71,6 +71,8 @@ gnome\-packagekit application\&.
.br
.I \fR * history [info|list|summary|redo|undo|new]
.br
+.I \fR * check
+.br
.I \fR * help [command]
.br
.PP
@@ -82,10 +84,10 @@ Repository configuration is honored in all operations.
.IP "\fBinstall\fP"
Is used to install the latest version of a package or
group of packages while ensuring that all dependencies are
-satisfied\&. If no package matches the given package name(s), they are
-assumed to be a shell glob and any matches are then installed\&. If the
-name starts with an @ character the rest of the name is used as though
-passed to the groupinstall command\&. If the name is a file, then install works
+satisfied\&. (See \fBSpecifying package names\fP for more information)
+If no package matches the given package name(s), they are assumed to be a shell
+glob and any matches are then installed\&. If the name starts with an
+@ character the rest of the name is used as though passed to the groupinstall command\&. If the name is a file, then install works
like localinstall\&. If the name doesn't match a package, then package
"provides" are searched (Eg. "_sqlitecache.so()(64bit)") as are
filelists (Eg. "/usr/bin/yum"). Also note that for filelists, wildcards will
@@ -95,8 +97,8 @@ match multiple packages\&.
If run without any packages, update will update every currently
installed package. If one or more packages or package globs are specified, Yum will
only update the listed packages\&. While updating packages, \fByum\fP
-will ensure that all dependencies are satisfied\&. If the packages or globs
-specified match to packages which are not currently installed then update will
+will ensure that all dependencies are satisfied\&. (See \fBSpecifying package names\fP for more information)
+If the packages or globs specified match to packages which are not currently installed then update will
not install them\&. update operates on groups, files, provides and filelists
just like the "install" command\&.
@@ -121,7 +123,7 @@ for more details.
Are used to remove the specified packages from the system
as well as removing any packages which depend on the package being
removed\&. remove operates on groups, files, provides and filelists just like
-the "install" command\&.
+the "install" command\&.(See \fBSpecifying package names\fP for more information)
.IP
.IP "\fBlist\fP"
Is used to list various information about available
@@ -227,7 +229,22 @@ dependencies for the given packages.
.IP "\fBrepolist\fP"
Produces a list of configured repositories. The default is to list all
enabled repositories. If you pass \-v, for verbose mode, more information is
-listed.
+listed. If the first argument is 'enabled', 'disabled' or 'all' then the command
+will list those types of repos.
+
+You can pass repo id or name arguments, or wildcards which to match against
+both of those. However if the ir or name matches exactly then the repo will
+be listed even if you are listing enabled repos. and it is disabled.
+
+In non-verbose mode the first column will start with a '*' if the repo. has
+metalink data and the latest metadata is not local. For non-verbose mode the
+last column will also display the number of packages in the repo. and (if there
+are any user specified excludes) the number of packages excluded.
+
+One last special feature of repolist, is that if you are in non-verbose mode
+then yum will ignore any repo errors and output the information it can get
+(Eg. "yum clean all; yum -C repolist" will output something, although the
+package counts/etc. will be zeroed out).
.IP
.IP "\fBversion\fP"
Produces a "version" of the rpmdb, and of the enabled repositories if "all" is
@@ -244,10 +261,31 @@ transactions (assuming the history_record config. option is set). You can use
info/list/summary to view what happened, undo/redo to act on that information
and new to start a new history file.
-The info/list/summary commands take either a transactions id or a package (with
+The info/list/summary commands take either a transaction id or a package (with
wildcards, as in \fBSpecifying package names\fP), all three can also be passed
no arguments. list can be passed the keyword "all" to list all the transactions.
-undo/redo just take a transaction id.
+
+The undo/redo commands take either a transaction id or the keyword last and
+an offset from the last transaction (Eg. if you've done 250 transactions,
+"last" refers to transaction 250, and "last-4" refers to transaction 246).
+
+In "history list" output the Altered column also gives some extra information
+if there was something not good with the transaction.
+
+.I \fB>\fR - The rpmdb was changed, outside yum, after the transaction.
+.br
+.I \fB<\fR - The rpmdb was changed, outside yum, before the transaction.
+.br
+.I \fB*\fR - The transaction aborted before completion.
+.br
+.I \fB#\fR - The transaction completed, but with a non-zero status.
+.br
+
+.IP
+.IP "\fBcheck\fP"
+Checks the local rpmdb and produces information on any problems it finds. You
+can pass the check command the arguments "dependencies" or "duplicates", to
+limit the checking that is performed (the default is "all" which does both).
.IP
.IP "\fBhelp\fP"
Produces help, either for all commands or if given a command name then the help
@@ -261,12 +299,12 @@ to set\&.
.PP
.IP "\fB\-h, \-\-help\fP"
Help; display a help message and then quit\&.
-.IP "\fB\-y\fP"
+.IP "\fB\-y, \-\-assumeyes\fP"
Assume yes; assume that the answer to any question which would be asked
is yes\&.
.br
Configuration Option: \fBassumeyes\fP
-.IP "\fB\-c [config file]\fP"
+.IP "\fB\-c, \-\-config=[config file]\fP"
Specifies the config file location - can take HTTP and FTP URLs and local file
paths\&.
.br
@@ -276,19 +314,24 @@ Run without output. Note that you likely also want to use \-y\&.
.IP "\fB\-v, \-\-verbose\fP"
Run with a lot of debugging output\&.
.br
-.IP "\fB\-d [number]\fP"
+.IP "\fB\-d, \-\-debuglevel=[number]\fP"
Sets the debugging level to [number] \- turns up or down the amount of things that are printed\&. Practical range: 0 - 10
.br
Configuration Option: \fBdebuglevel\fP
-.IP "\fB\-e [number]\fP"
+.IP "\fB\-e, \-\-errorlevel=[number]\fP"
Sets the error level to [number] Practical range 0 \- 10. 0 means print only critical errors about which you must be told. 1 means print all errors, even ones that are not overly important. 1+ means print more errors (if any) \-e 0 is good for cron jobs.
.br
Configuration Option: \fBerrorlevel\fP
-.IP "\fB\-R [time in minutes]\fP"
+.IP "\fB\-\-rpmverbosity=[name]\fP"
+Sets the debug level to [name] for rpm scriplets. 'info' is the default, other
+options are: 'critical', 'emergency', 'error', 'warn' and 'debug'.
+.br
+Configuration Option: \fBrpmverbosity\fP
+.IP "\fB\-R, \-\-randomwait=[time in minutes]\fP"
Sets the maximum amount of time yum will wait before performing a command \- it randomizes over the time.
-.IP "\fB\-C\fP"
-Tells yum to run entirely from cache - does not download or update any
-headers unless it has to to perform the requested action.
+.IP "\fB\-C, \-\-cacheonly\fP"
+Tells yum to run entirely from system cache - does not download or
+update any headers unless it has to to perform the requested action.
.IP "\fB\-\-version\fP"
Reports the \fByum\fP version number and installed package versions for
everything in history_record_packages (can be added to by plugins).
@@ -350,8 +393,14 @@ Resolve depsolve problems by removing packages that are causing problems
from the transaction.
.br
Configuration Option: \fBskip_broken\fP
+.br
+.IP "\fB\-\-releasever=version\fP"
+Pretend the current release version is the given string. This is very useful
+when combined with \-\-installroot. Note that with the default upstream cachedir,
+of /var/cache/yum, using this option will corrupt your cache (and you can use
+$releasever in your cachedir configuration to stop this).
.PP
-.IP "\fB\-t, --tolerant\fP"
+.IP "\fB\-t, \-\-tolerant\fP"
This option currently does nothing.
.br
.SH "LIST OPTIONS"
@@ -364,7 +413,7 @@ version of the package\&.
The format of the output of yum list is:
-name.arch \[epoch\:\]version-release repo or \@installed-from-repo
+name.arch [epoch:]version-release repo or \@installed-from-repo
.IP "\fByum list [all | glob_exp1] [glob_exp2] [\&.\&.\&.]\fP"
List all available and installed packages\&.
@@ -388,13 +437,36 @@ List the packages installed on the system that are obsoleted by packages
in any yum repository listed in the config file.
.IP
.IP "\fByum list recent\fP"
-List packages recently added into the repositories.
+List packages recently added into the repositories. This is often not helpful,
+but what you may really want to use is "yum list-updateinfo new" from the
+security yum plugin.
.IP
-.IP "\fBSpecifying package names\fP"
-All the list options mentioned above take file-glob-syntax wildcards or package
-names as arguments, for example \fByum list available 'foo*'\fP will list
-all available packages that match 'foo*'. (The single quotes will keep your
-shell from expanding the globs.)
+
+.PP
+.SH "SPECIFYING PACKAGE NAMES"
+A package can be referred to for install, update, remove, list, info etc
+with any of the following as well as globs of any of the following:
+.IP
+.br
+\fBname\fP
+.br
+\fBname.arch\fP
+.br
+\fBname-ver\fP
+.br
+\fBname-ver-rel\fP
+.br
+\fBname-ver-rel.arch\fP
+.br
+\fBname-epoch:ver-rel.arch\fP
+.br
+\fBepoch:name-ver-rel.arch\fP
+.IP
+For example: \fByum remove kernel-2.4.1-10.i686\fP
+ this will remove this specific kernel-ver-rel.arch.
+.IP
+Or: \fByum list available 'foo*'\fP
+ will list all available packages that match 'foo*'. (The single quotes will keep your shell from expanding the globs.)
.IP
.PP
.SH "CLEAN OPTIONS"
@@ -402,7 +474,7 @@ The following are the ways which you can invoke \fByum\fP in clean
mode. Note that "all files" in the commands below means
"all files in currently enabled repositories".
If you want to also clean any (temporarily) disabled repositories you need to
-use \fB--enablerepo='*'\fP option.
+use \fB\-\-enablerepo='*'\fP option.
.IP "\fByum clean expire-cache\fP"
Eliminate the local data saying when the metadata and mirrorlists were downloaded for each repo. This means yum will revalidate the cache for each repo. next time it is used. However if the cache is still valid, nothing significant was deleted.
@@ -411,7 +483,8 @@ Eliminate the local data saying when the metadata and mirrorlists were downloade
Eliminate any cached packages from the system. Note that packages are not automatically deleted after they are downloaded.
.IP "\fByum clean headers\fP"
-Eliminate all of the header files which yum uses for dependency resolution.
+Eliminate all of the header files, which old versions of yum used for
+dependency resolution.
.IP "\fByum clean metadata\fP"
Eliminate all of the files which yum uses to determine the remote
@@ -420,34 +493,22 @@ metadata the next time it is run.
.IP "\fByum clean dbcache\fP"
Eliminate the sqlite cache used for faster access to metadata.
-Using this option will force yum to recreate the cache the next time
-it is run.
+Using this option will force yum to download the sqlite metadata the next time
+it is run, or recreate the sqlite metadata if using an older repo.
-.IP "\fByum clean all\fP"
-Runs \fByum clean packages\fP and \fByum clean headers\fP, \fByum clean metadata\fP and \fByum clean dbcache\fP as above.
+.IP "\fByum clean dbcache\fP"
+Eliminate the sqlite cache used for faster access to metadata.
+Using this option will force yum to download the sqlite metadata the next time
+it is run, or recreate the sqlite metadata if using an older repo.
-.PP
-.SH "MISC"
-.IP "\fBSpecifying package names\fP"
-A package can be referred to for install,update,list,remove etc with any
-of the following:
-.IP
-.br
-\fBname\fP
-.br
-\fBname.arch\fP
-.br
-\fBname-ver\fP
-.br
-\fBname-ver-rel\fP
-.br
-\fBname-ver-rel.arch\fP
-.br
-\fBname-epoch:ver-rel.arch\fP
-.br
-\fBepoch:name-ver-rel.arch\fP
-.IP
-For example: \fByum remove kernel-2.4.1-10.i686\fP
+.IP "\fByum clean rpmdb\fP"
+Eliminate any cached data from the local rpmdb.
+
+.IP "\fByum clean plugins\fP"
+Tell any enabled plugins to eliminate their cached data.
+
+.IP "\fByum clean all\fP"
+Does all of the above.
.PP
.SH "PLUGINS"
@@ -492,6 +553,7 @@ configuration options.
.I yum-complete-transaction (1)
.I yumdownloader (1)
.I yum-utils (1)
+.I yum-security (8)
http://yum.baseurl.org/
http://yum.baseurl.org/wiki/Faq
yum search yum
diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index eab9335..cca3db7 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -57,6 +57,11 @@ Debug message output level. Practical range is 0\-10. Default is `2'.
Error message output level. Practical range is 0\-10. Default is `2'.
.IP
+\fBrpmverbosity\fR
+Debug scriptlet output level. 'info' is the default, other
+options are: 'critical', 'emergency', 'error', 'warn' and 'debug'.
+
+.IP
\fBlogfile\fR
Full directory and file name for where yum should write its log file.
@@ -289,7 +294,7 @@ history undo/redo commands. Defaults to True.
This is a list of package names that should be recorded as having helped the
transaction. yum plugins have an API to add themselves to this, so it should not
normally be necessary to add packages here. Not that this is also used for the
-packages to look for in --version. Defaults to rpm, yum, yum-metadata-parser.
+packages to look for in \-\-version. Defaults to rpm, yum, yum-metadata-parser.
.IP
\fBcommands\fR
@@ -696,6 +701,13 @@ If this is unset it inherits it from the global setting
relative cost of accessing this repository. Useful for weighing one repo's packages
as greater/less than any other. defaults to 1000
+.IP
+\fBskip_if_unavailable \fR
+If set to True yum will continue running if this repository cannot be
+contacted for any reason. This should be set carefully as all repos are consulted
+for any given command. Defaults to False.
+.IP
+
.SH "URL INCLUDE SYNTAX"
.LP
The inclusion of external configuration files is supported for /etc/yum/yum.conf
@@ -732,6 +744,12 @@ This will be replaced with your base architecture in yum. For example, if
your $arch is i686 your $basearch will be i386.
.IP
+\fB$uuid\fR
+This will be replaced with a unique but persistent uuid for this machine.
+The value that is first generated will be stored in /var/lib/yum/uuid and
+reused until this file is deleted.
+
+.IP
\fB$YUM0-$YUM9\fR
These will be replaced with the value of the shell environment variable of
the same name. If the shell environment variable does not exist then the
diff --git a/etc/Makefile b/etc/Makefile
index 7a083f7..68dd3c2 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -25,4 +25,5 @@ install:
install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
-
+ mkdir -p $(DESTDIR)/etc/bash_completion.d
+ install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
diff --git a/etc/version-groups.conf b/etc/version-groups.conf
index 57d97dd..6e10998 100644
--- a/etc/version-groups.conf
+++ b/etc/version-groups.conf
@@ -6,6 +6,7 @@
# even though that's require by rpm(-libs).
run_with_packages = true
pkglist = glibc, sqlite, libcurl, nss,
+ yum-metadata-parser,
rpm, rpm-libs, rpm-python,
python,
python-iniparse, python-urlgrabber, python-pycurl
diff --git a/etc/yum.bash b/etc/yum.bash
new file mode 100644
index 0000000..5dfdb64
--- /dev/null
+++ b/etc/yum.bash
@@ -0,0 +1,315 @@
+# bash completion for yum
+
+# arguments:
+# 1 = argument to "yum list" (all, available, updates etc)
+# 2 = current word to be completed
+_yum_list()
+{
+ if [ "$1" = all ] ; then
+ # Try to strip in between headings like "Available Packages" - would
+ # be nice if e.g. -d 0 did that for us. This will obviously only work
+ # for English :P
+ COMPREPLY=( "${COMPREPLY[@]}"
+ $( ${yum:-yum} -d 0 -C list $1 "$2*" 2>/dev/null | \
+ sed -ne '/^Available /d' -e '/^Installed /d' -e '/^Updated /d' \
+ -e 's/[[:space:]].*//p' ) )
+ else
+ # Drop first line (e.g. "Updated Packages") - would be nice if e.g.
+ # -d 0 did that for us.
+ COMPREPLY=( "${COMPREPLY[@]}"
+ $( ${yum:-yum} -d 0 -C list $1 "$2*" 2>/dev/null | \
+ sed -ne 1d -e 's/[[:space:]].*//p' ) )
+ fi
+}
+
+# arguments:
+# 1 = argument to "yum repolist" (enabled, disabled etc)
+# 2 = current word to be completed
+_yum_repolist()
+{
+ # TODO: add -d 0 when http://yum.baseurl.org/ticket/29 is fixed
+ # (for now --noplugins is used to get rid of "Loaded plugins: ...")
+ # Drop first ("repo id repo name") and last ("repolist: ...") rows -
+ # would be nice if e.g. -d 0 did that for us.
+ COMPREPLY=( "${COMPREPLY[@]}"
+ $( compgen -W "$( ${yum:-yum} --noplugins -C repolist $1 2>/dev/null | \
+ sed -ne '/^repo\s\{1,\}id/d' -e '/^repolist:/d' \
+ -e 's/[[:space:]].*//p' )" -- "$2" ) )
+}
+
+# arguments:
+# 1 = argument to "yum grouplist" (usually empty (""), or hidden)
+# 2 = current word to be completed
+_yum_grouplist()
+{
+ local IFS=$'\n'
+ # TODO: add -d 0 when http://yum.baseurl.org/ticket/29 is fixed
+ COMPREPLY=( $( compgen -W "$( ${yum:-yum} -C grouplist $1 "$2*" \
+ 2>/dev/null | sed -ne 's/^[[:space:]]\{1,\}\(.\{1,\}\)/\1/p' )" \
+ -- "$2" ) )
+}
+
+# arguments:
+# 1 = 1 or 0 to list enabled or disabled plugins
+# 2 = current word to be completed
+_yum_plugins()
+{
+ local val
+ [ $1 = 1 ] && val='\(1\|yes\|true\|on\)' || val='\(0\|no\|false\|off\)'
+ COMPREPLY=( "${COMPREPLY[@]}"
+ $( compgen -W '$( command grep -il "^\s*enabled\s*=\s*$val" \
+ /etc/yum/pluginconf.d/*.conf 2>/dev/null \
+ | sed -ne "s|^.*/\([^/]\{1,\}\)\.conf$|\1|p" )' -- "$2" ) )
+}
+
+# arguments:
+# 1 = current word to be completed
+_yum_binrpmfiles()
+{
+ COMPREPLY=( "${COMPREPLY[@]}"
+ $( compgen -f -o plusdirs -X '!*.rpm' -- "$1" ) )
+ COMPREPLY=( $( compgen -W '"${COMPREPLY[@]}"' -X '*.src.rpm' ) )
+ COMPREPLY=( $( compgen -W '"${COMPREPLY[@]}"' -X '*.nosrc.rpm' ) )
+}
+
+_yum()
+{
+ COMPREPLY=()
+ local yum=$1
+ local cur
+ type _get_cword &>/dev/null && cur=`_get_cword` || cur=$2
+ local prev=$3
+ local cmds=( check check-update clean deplist downgrade groupinfo
+ groupinstall grouplist groupremove help history info install list
+ localinstall makecache provides reinstall remove repolist resolvedep
+ search shell update upgrade version )
+
+ local i c cmd
+ for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+ for c in ${cmds[@]} check-rpmdb erase groupupdate grouperase \
+ whatprovides ; do
+ [ ${COMP_WORDS[i]} = $c ] && cmd=$c && break
+ done
+ [ -z $cmd ] || break
+ done
+
+ case $cmd in
+
+ check|check-rpmdb)
+ COMPREPLY=( $( compgen -W 'dependencies duplicates all' \
+ -- "$cur" ) )
+ return 0
+ ;;
+
+ check-update|grouplist|makecache|provides|whatprovides|resolvedep|\
+ search|version)
+ return 0
+ ;;
+
+ clean)
+ if [ "$prev" = clean ] ; then
+ COMPREPLY=( $( compgen -W 'expire-cache packages headers
+ metadata cache dbcache all' -- "$cur" ) )
+ fi
+ return 0
+ ;;
+
+ deplist)
+ if [[ "$cur" == */* ]] ; then
+ _yum_binrpmfiles "$cur"
+ else
+ _yum_list all "$cur"
+ fi
+ return 0
+ ;;
+
+ downgrade|reinstall)
+ if [[ "$cur" == */* ]] ; then
+ _yum_binrpmfiles "$cur"
+ else
+ _yum_list installed "$cur"
+ fi
+ return 0
+ ;;
+
+ erase|remove)
+ _yum_list installed "$cur"
+ return 0
+ ;;
+
+ group*)
+ _yum_grouplist "" "$cur"
+ return 0
+ ;;
+
+ help)
+ if [ "$prev" = help ] ; then
+ COMPREPLY=( $( compgen -W '${cmds[@]}' -- "$cur" ) )
+ fi
+ return 0
+ ;;
+
+ history)
+ case $prev in
+ history)
+ COMPREPLY=( $( compgen -W 'info list summary undo redo
+ new' -- "$cur" ) )
+ ;;
+ undo|redo)
+ COMPREPLY=( $( compgen -W "last $( $yum -d 0 -C history \
+ 2>/dev/null | \
+ sed -ne 's/^[[:space:]]*\([0-9]\{1,\}\).*/\1/p' )" \
+ -- "$cur" ) )
+ ;;
+ esac
+ return 0
+ ;;
+
+ info)
+ _yum_list all "$cur"
+ return 0
+ ;;
+
+ install)
+ if [[ "$cur" == */* ]] ; then
+ _yum_binrpmfiles "$cur"
+ else
+ _yum_list available "$cur"
+ fi
+ return 0
+ ;;
+
+ list)
+ if [ "$prev" = list ] ; then
+ COMPREPLY=( $( compgen -W 'all available updates installed
+ extras obsoletes recent' -- "$cur" ) )
+ fi
+ return 0
+ ;;
+
+ localinstall|localupdate)
+ _yum_binrpmfiles "$cur"
+ return 0
+ ;;
+
+ repolist)
+ if [ "$prev" = repolist ] ; then
+ COMPREPLY=( $( compgen -W 'all enabled disabled' -- "$cur" ) )
+ fi
+ return 0
+ ;;
+
+ shell)
+ if [ "$prev" = shell ] ; then
+ COMPREPLY=( $( compgen -f -o plusdirs -- "$cur" ) )
+ fi
+ return 0
+ ;;
+
+ update|upgrade)
+ if [[ "$cur" == */* ]] ; then
+ _yum_binrpmfiles "$cur"
+ else
+ _yum_list updates "$cur"
+ fi
+ return 0
+ ;;
+ esac
+
+ local split=false
+ type _split_longopt &>/dev/null && _split_longopt && split=true
+
+ case $prev in
+
+ -d|--debuglevel|-e|--errorlevel)
+ COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9 10' -- "$cur" ) )
+ return 0
+ ;;
+
+ --rpmverbosity)
+ COMPREPLY=( $( compgen -W 'info critical emergency error warn
+ debug' -- "$cur" ) )
+ return 0
+ ;;
+
+ -c|--config)
+ COMPREPLY=( $( compgen -f -o plusdirs -X "!*.conf" -- "$cur" ) )
+ return 0
+ ;;
+
+ --installroot|--downloaddir)
+ COMPREPLY=( $( compgen -d -- "$cur" ) )
+ return 0
+ ;;
+
+ --enablerepo)
+ _yum_repolist disabled "$cur"
+ return 0
+ ;;
+
+ --disablerepo)
+ _yum_repolist enabled "$cur"
+ return 0
+ ;;
+
+ --disableexcludes)
+ _yum_repolist all "$cur"
+ COMPREPLY=( $( compgen -W '${COMPREPLY[@]} all main' -- "$cur" ) )
+ return 0
+ ;;
+
+ --enableplugin)
+ _yum_plugins 0 "$cur"
+ return 0
+ ;;
+
+ --disableplugin)
+ _yum_plugins 1 "$cur"
+ return 0
+ ;;
+
+ --color)
+ COMPREPLY=( $( compgen -W 'always auto never' -- "$cur" ) )
+ return 0
+ ;;
+
+ -R|--randomwait|-x|--exclude|-h|--help|--version|--releasever|--cve|\
+ --bz|--advisory|--tmprepo|--verify-filenames)
+ return 0
+ ;;
+
+ --download-order)
+ COMPREPLY=( $( compgen -W 'default smallestfirst largestfirst' \
+ -- "$cur" ) )
+ return 0
+ ;;
+
+ --override-protection)
+ _yum_list installed "$cur"
+ return 0
+ ;;
+
+ --verify-configuration-files)
+ COMPREPLY=( $( compgen -W '1 0' -- "$cur" ) )
+ return 0
+ ;;
+ esac
+
+ $split && return 0
+
+ COMPREPLY=( $( compgen -W '--help --tolerant --cacheonly --config
+ --randomwait --debuglevel --showduplicates --errorlevel --rpmverbosity
+ --quiet --verbose --assumeyes --version --installroot --enablerepo
+ --disablerepo --exclude --disableexcludes --obsoletes --noplugins
+ --nogpgcheck --disableplugin --enableplugin --skip-broken --color
+ --releasever ${cmds[@]}' -- "$cur" ) )
+} &&
+complete -F _yum -o filenames yum yummain.py
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/output.py b/output.py
index e462646..110aa0b 100755
--- a/output.py
+++ b/output.py
@@ -35,7 +35,7 @@ from urlgrabber.grabber import URLGrabError
from yum.misc import prco_tuple_to_string
from yum.i18n import to_str, to_utf8, to_unicode
import yum.misc
-from rpmUtils.miscutils import checkSignals
+from rpmUtils.miscutils import checkSignals, formatRequire
from yum.constants import *
from yum import logginglevels, _
@@ -473,9 +473,7 @@ class YumOutput:
ver = pkg.printVer()
na = '%s%s.%s' % (indent, pkg.name, pkg.arch)
hi_cols = [highlight, 'normal', 'normal']
- rid = pkg.repoid
- if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
- rid = '@' + pkg.yumdb_info.from_repo
+ rid = pkg.ui_from_repo
columns = zip((na, ver, rid), columns, hi_cols)
print self.fmtColumns(columns)
@@ -488,9 +486,7 @@ class YumOutput:
columns = (-63, -16) # Old default
envra = '%s%s' % (indent, str(pkg))
hi_cols = [highlight, 'normal', 'normal']
- rid = pkg.repoid
- if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
- rid = '@' + pkg.yumdb_info.from_repo
+ rid = pkg.ui_from_repo
columns = zip((envra, rid), columns, hi_cols)
print self.fmtColumns(columns)
@@ -554,7 +550,7 @@ class YumOutput:
print self.fmtKeyValFill(_("Summary : "), self._enc(pkg.summary))
if pkg.url:
print _("URL : %s") % to_unicode(pkg.url)
- print _("License : %s") % to_unicode(pkg.license)
+ print self.fmtKeyValFill(_("License : "), to_unicode(pkg.license))
print self.fmtKeyValFill(_("Description: "), self._enc(pkg.description))
print ""
@@ -688,10 +684,7 @@ class YumOutput:
for (apkg, ipkg) in pkg_names2pkgs[item]:
pkg = ipkg or apkg
envra = utf8_width(str(pkg)) + utf8_width(indent)
- if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
- rid = len(pkg.yumdb_info.from_repo) + 1
- else:
- rid = len(pkg.repoid)
+ rid = len(pkg.ui_from_repo)
for (d, v) in (('envra', envra), ('rid', rid)):
data[d].setdefault(v, 0)
data[d][v] += 1
@@ -770,7 +763,7 @@ class YumOutput:
def format_number(self, number, SI=0, space=' '):
"""Turn numbers into human-readable metric-like numbers"""
- symbols = ['', # (none)
+ symbols = [ ' ', # (none)
'k', # kilo
'M', # mega
'G', # giga
@@ -871,10 +864,11 @@ class YumOutput:
def matchcallback_verbose(self, po, values, matchfor=None):
return self.matchcallback(po, values, matchfor, verbose=True)
- def reportDownloadSize(self, packages):
+ def reportDownloadSize(self, packages, installonly=False):
"""Report the total download size for a set of packages"""
totsize = 0
locsize = 0
+ insize = 0
error = False
for pkg in packages:
# Just to be on the safe side, if for some reason getting
@@ -888,6 +882,15 @@ class YumOutput:
locsize += size
except:
pass
+
+ if not installonly:
+ continue
+
+ try:
+ size = int(pkg.installedsize)
+ except:
+ pass
+ insize += size
except:
error = True
self.logger.error(_('There was an error calculating total download size'))
@@ -900,6 +903,10 @@ class YumOutput:
if locsize != totsize:
self.verbose_logger.log(logginglevels.INFO_1, _("Total download size: %s"),
self.format_number(totsize - locsize))
+ if installonly:
+ self.verbose_logger.log(logginglevels.INFO_1,
+ _("Installed size: %s"),
+ self.format_number(insize))
def listTransaction(self):
"""returns a string rep of the transaction in an easy-to-read way."""
@@ -912,7 +919,7 @@ class YumOutput:
def _add_line(lines, data, a_wid, po, obsoletes=[]):
(n,a,e,v,r) = po.pkgtup
evr = po.printVer()
- repoid = po.repoid
+ repoid = po.ui_from_repo
pkgsize = float(po.size)
size = self.format_number(pkgsize)
@@ -986,8 +993,8 @@ class YumOutput:
(evr, -v_wid), (repoid, -r_wid), (size, s_wid))
msg = self.fmtColumns(columns, u" ", u"\n")
hibeg, hiend = self._highlight(self.conf.color_update_installed)
- for obspo in obsoletes:
- appended = _(' replacing %s%s%s.%s %s\n\n')
+ for obspo in sorted(obsoletes):
+ appended = _(' replacing %s%s%s.%s %s\n')
appended %= (hibeg, obspo.name, hiend,
obspo.arch, obspo.printVer())
msg = msg+appended
@@ -1192,7 +1199,14 @@ to exit.
count += 1
assert len(actions) <= 6
if len(actions) > 1:
- return count, ", ".join([x[0] for x in sorted(actions)])
+ large2small = {'Install' : _('I'),
+ 'Obsoleting' : _('O'),
+ 'Erase' : _('E'),
+ 'Reinstall' : _('R'),
+ 'Downgrade' : _('D'),
+ 'Update' : _('U'),
+ }
+ return count, ", ".join([large2small[x] for x in sorted(actions)])
# So empty transactions work, although that "shouldn't" really happen
return count, "".join(list(actions))
@@ -1204,7 +1218,7 @@ to exit.
name = _("System") + " " + loginid
if limit is not None and len(name) > limit:
name = loginid
- return name
+ return to_unicode(name)
try:
user = pwd.getpwuid(uid)
@@ -1214,9 +1228,9 @@ to exit.
name = "%s ... <%s>" % (fullname.split()[0], user.pw_name)
if len(name) > limit:
name = "<%s>" % user.pw_name
- return name
+ return to_unicode(name)
except KeyError:
- return str(uid)
+ return to_unicode(str(uid))
def _history_list_transactions(self, extcmds):
tids = set()
@@ -1248,10 +1262,14 @@ to exit.
if tids is None:
return 1, ['Failed history info']
- fmt = "%-6s | %-22s | %-16s | %-14s | %-7s"
- print fmt % ("ID", "Login user", "Date and time", "Action(s)","Altered")
+ fmt = "%s | %s | %s | %s | %s"
+ print fmt % (utf8_width_fill(_("ID"), 6, 6),
+ utf8_width_fill(_("Login user"), 22, 22),
+ utf8_width_fill(_("Date and time"), 16, 16),
+ utf8_width_fill(_("Action(s)"), 14, 14),
+ utf8_width_fill(_("Altered"), 7, 7))
print "-" * 79
- fmt = "%6u | %-22.22s | %-16s | %-14s | %4u"
+ fmt = "%6u | %s | %-16.16s | %s | %4u"
done = 0
limit = 20
if printall:
@@ -1265,24 +1283,27 @@ to exit.
tm = time.strftime("%Y-%m-%d %H:%M",
time.localtime(old.beg_timestamp))
num, uiacts = self._history_uiactions(old.trans_data)
- if old.altered_lt_rpmdb and old.altered_gt_rpmdb:
- print fmt % (old.tid, name, tm, uiacts, num), "><"
- elif old.return_code is None:
- print fmt % (old.tid, name, tm, uiacts, num), "**"
- elif old.altered_lt_rpmdb:
- print fmt % (old.tid, name, tm, uiacts, num), " <"
- elif old.altered_gt_rpmdb:
- print fmt % (old.tid, name, tm, uiacts, num), "> "
- else:
- print fmt % (old.tid, name, tm, uiacts, num)
+ name = utf8_width_fill(name, 22, 22)
+ uiacts = utf8_width_fill(uiacts, 14, 14)
+ rmark = lmark = ' '
+ if old.return_code is None:
+ rmark = lmark = '*'
+ elif old.return_code:
+ rmark = lmark = '#'
+ if old.altered_lt_rpmdb:
+ rmark = '<'
+ if old.altered_gt_rpmdb:
+ lmark = '>'
+ print fmt % (old.tid, name, tm, uiacts, num), "%s%s" % (lmark,rmark)
lastdbv = self.history.last()
- if lastdbv is not None:
+ if lastdbv is None:
+ self._rpmdb_warn_checks(warn=False)
+ else:
# If this is the last transaction, is good and it doesn't
# match the current rpmdb ... then mark it as bad.
rpmdbv = self.rpmdb.simpleVersion(main_only=True)[0]
if lastdbv.end_rpmdbversion != rpmdbv:
- errstring = _('Warning: RPMDB has been altered since the last yum transaction.')
- self.logger.warning(errstring)
+ self._rpmdb_warn_checks()
def _history_get_transactions(self, extcmds):
if len(extcmds) < 2:
@@ -1290,12 +1311,30 @@ to exit.
return None
tids = []
- try:
- int(extcmds[1])
- tids.append(extcmds[1])
- except ValueError:
- self.logger.critical(_('Bad transaction ID given'))
- return None
+ last = None
+ for extcmd in extcmds[1:]:
+ try:
+ if extcmd == 'last' or extcmd.startswith('last-'):
+ if last is None:
+ cto = False
+ last = self.history.last(complete_transactions_only=cto)
+ if last is None:
+ int("z")
+ tid = last.tid
+ if extcmd.startswith('last-'):
+ off = int(extcmd[len('last-'):])
+ if off <= 0:
+ int("z")
+ tid -= off
+ tids.append(str(tid))
+ continue
+
+ if int(extcmd) <= 0:
+ int("z")
+ tids.append(extcmd)
+ except ValueError:
+ self.logger.critical(_('Bad transaction ID given'))
+ return None
old = self.history.old(tids)
if not old:
@@ -1323,7 +1362,7 @@ to exit.
tids.update(self.history.search(pats))
if not tids and len(extcmds) < 2:
- old = self.history.last()
+ old = self.history.last(complete_transactions_only=False)
if old is not None:
tids.add(old.tid)
@@ -1405,7 +1444,7 @@ to exit.
state = _('Downgraded')
else: # multiple versions installed, both older and newer
state = _('Weird')
- print "%s%-12s %s" % (prefix, state, hpkg)
+ print "%s%s %s" % (prefix, utf8_width_fill(state, 12), hpkg)
print _("Packages Altered:")
self.historyInfoCmdPkgsAltered(old, pats)
if old.output:
@@ -1422,6 +1461,7 @@ to exit.
print "%4d" % num, line
def historyInfoCmdPkgsAltered(self, old, pats=[]):
+ last = None
for hpkg in old.trans_data:
prefix = " " * 4
if not hpkg.done:
@@ -1436,35 +1476,53 @@ to exit.
# To chop the name off we need nevra strings, str(pkg) gives envra
# so we have to do it by hand ... *sigh*.
- if hpkg.epoch == '0':
- cn = str(hpkg)
- else:
- cn = "%s-%s:%s-%s.%s" % (hpkg.name, hpkg.epoch,
- hpkg.version, hpkg.release, hpkg.arch)
-
+ cn = hpkg.ui_nevra
+
+ uistate = {'True-Install' : _('Install'),
+ 'Install' : _('Install'),
+ 'Dep-Install' : _('Dep-Install'),
+ 'Obsoleted' : _('Obsoleted'),
+ 'Obsoleting' : _('Obsoleting'),
+ 'Erase' : _('Erase'),
+ 'Reinstall' : _('Reinstall'),
+ 'Downgrade' : _('Downgrade'),
+ 'Downgraded' : _('Downgraded'),
+ 'Update' : _('Update'),
+ 'Updated' : _('Updated'),
+ }.get(hpkg.state, hpkg.state)
+ uistate = utf8_width_fill(uistate, 12, 12)
+ # Should probably use columns here...
if False: pass
- elif hpkg.state == 'Update':
+ elif (last is not None and
+ last.state == 'Updated' and last.name == hpkg.name and
+ hpkg.state == 'Update'):
ln = len(hpkg.name) + 1
cn = (" " * ln) + cn[ln:]
- print "%s%s%-12s%s %s" % (prefix, hibeg, hpkg.state, hiend, cn)
- elif hpkg.state == 'Downgraded':
+ print "%s%s%s%s %s" % (prefix, hibeg, uistate, hiend, cn)
+ elif (last is not None and
+ last.state == 'Downgrade' and last.name == hpkg.name and
+ hpkg.state == 'Downgraded'):
ln = len(hpkg.name) + 1
cn = (" " * ln) + cn[ln:]
- print "%s%s%-12s%s %s" % (prefix, hibeg, hpkg.state, hiend, cn)
- elif hpkg.state == 'True-Install':
- print "%s%s%-12s%s %s" % (prefix, hibeg, "Install", hiend, cn)
+ print "%s%s%s%s %s" % (prefix, hibeg, uistate, hiend, cn)
else:
- print "%s%s%-12s%s %s" % (prefix, hibeg, hpkg.state, hiend, cn)
+ last = None
+ if hpkg.state in ('Updated', 'Downgrade'):
+ last = hpkg
+ print "%s%s%s%s %s" % (prefix, hibeg, uistate, hiend, cn)
def historySummaryCmd(self, extcmds):
tids, printall = self._history_list_transactions(extcmds)
if tids is None:
return 1, ['Failed history info']
- fmt = "%-26s | %-19s | %-16s | %-8s"
- print fmt % ("Login user", "Time", "Action(s)", "Altered")
+ fmt = "%s | %s | %s | %s"
+ print fmt % (utf8_width_fill(_("Login user"), 26, 26),
+ utf8_width_fill(_("Time"), 19, 19),
+ utf8_width_fill(_("Action(s)"), 16, 16),
+ utf8_width_fill(_("Altered"), 8, 8))
print "-" * 79
- fmt = "%-26.26s | %-19.19s | %-16s | %8u"
+ fmt = "%s | %s | %s | %8u"
data = {'day' : {}, 'week' : {},
'fortnight' : {}, 'quarter' : {}, 'half' : {},
'year' : {}, 'all' : {}}
@@ -1508,7 +1566,10 @@ to exit.
hpkgs.extend(old.trans_data)
count, uiacts = self._history_uiactions(hpkgs)
uperiod = _period2user[period]
- print fmt % (name, uperiod, uiacts, count)
+ # Should probably use columns here, esp. for uiacts?
+ print fmt % (utf8_width_fill(name, 22, 22),
+ utf8_width_fill(uperiod, 19, 19),
+ utf8_width_fill(uiacts, 16, 16), count)
class DepSolveProgressCallBack:
@@ -1562,6 +1623,42 @@ class DepSolveProgressCallBack:
self.verbose_logger.log(logginglevels.INFO_2, _('--> Unresolved Dependency: %s'),
msg)
+ def format_missing_requires(self, reqPo, reqTup):
+ """ Create a message for errorlist, non-cli users could also store this
+ data somewhere and not print errorlist. """
+ needname, needflags, needversion = reqTup
+
+ yb = self.ayum
+
+ prob_pkg = "%s (%s)" % (reqPo, reqPo.ui_from_repo)
+ msg = _('Package: %s') % (prob_pkg,)
+ ui_req = formatRequire(needname, needversion, needflags)
+ msg += _('\n Requires: %s') % (ui_req,)
+
+ # if DepSolveProgressCallback() is used instead of DepSolveProgressCallback(ayum=<YumBase Object>)
+ # then ayum has no value and we can't continue to find details about the missing requirements
+ if not yb:
+ return msg
+
+ ipkgs = set()
+ for pkg in sorted(yb.rpmdb.getProvides(needname)):
+ ipkgs.add(pkg.pkgtup)
+ action = _('Installed')
+ if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES):
+ action = _('Removing')
+ msg += _('\n %s: %s (%s)') % (action, pkg, pkg.ui_from_repo)
+ last = None
+ for pkg in sorted(yb.pkgSack.getProvides(needname)):
+ # We don't want to see installed packages, or N packages of the
+ # same version, from different repos.
+ if pkg.pkgtup in ipkgs or pkg.verEQ(last):
+ continue
+ last = pkg
+ action = _('Available')
+ if yb.tsInfo.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES):
+ action = _('Installing')
+ msg += _('\n %s: %s (%s)') % (action, pkg, pkg.repoid)
+ return msg
def procConflict(self, name, confname):
self.verbose_logger.log(logginglevels.INFO_2,
@@ -1814,6 +1911,18 @@ def progressbar(current, total, name=None):
if __name__ == "__main__":
+ if len(sys.argv) > 1 and sys.argv[1] == "format_number":
+ print ""
+ print " Doing format_number tests, right column should align"
+ print ""
+
+ x = YumOutput()
+ for i in (0, 0.0, 0.1, 1, 1.0, 1.1, 10, 11, 11.1, 100, 111.1,
+ 1000, 1111, 1024 * 2, 10000, 11111, 99999, 999999,
+ 10**19, 10**20, 10**35):
+ out = x.format_number(i)
+ print "%36s <%s> %s <%5s>" % (i, out, ' ' * (14 - len(out)), out)
+
if len(sys.argv) > 1 and sys.argv[1] == "progress":
print ""
print " Doing progress, small name"
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 0000000..cd1f2c9
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1 @@
+*.mo
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..d00a046
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1 @@
+XGETTEXT_OPTIONS = --keyword=P_:1,2
diff --git a/po/ca.po b/po/ca.po
index 1869dc2..86c5501 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-05 08:55+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-09-06 22:25+0100\n"
"Last-Translator: Agustí Grau <fedora@softcatala.org>\n"
"Language-Team: Catalan <fedora@softcatala.net>\n"
@@ -32,7 +32,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-Language: Catalan\n"
-#: ../callback.py:48 ../output.py:938 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Actualitzant"
@@ -40,7 +40,7 @@ msgstr "Actualitzant"
msgid "Erasing"
msgstr "Suprimint"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:937
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Instal·lant"
@@ -49,15 +49,16 @@ msgstr "Instal·lant"
msgid "Obsoleted"
msgstr "Obsolet"
-#: ../callback.py:54 ../output.py:1061
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Actualitzat"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Suprimit"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1059
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Instal·lat"
@@ -79,7 +80,7 @@ msgstr "Error: estat de sortida invàlid: %s per a %s"
msgid "Erased: %s"
msgstr "Suprimit: %s"
-#: ../callback.py:217 ../output.py:939
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Suprimint"
@@ -87,60 +88,60 @@ msgstr "Suprimint"
msgid "Cleanup"
msgstr "Neteja"
-#: ../cli.py:107
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "L'ordre «%s» ja està definida"
-#: ../cli.py:119
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Configurant repositoris"
-#: ../cli.py:130
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "S'estan llegint les metadades de repositoris des de fitxers locals"
-#: ../cli.py:193 ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Error de configuració: %s"
-#: ../cli.py:196 ../cli.py:1253 ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Error d'opcions: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Instal·lat: %s-%s a %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Muntat : %s a %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Pujat: %s a %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Cal que doneu alguna ordre"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Requeriments de disc:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Es necessiten almenys %dMB al sistema de fitxers %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -148,66 +149,66 @@ msgstr ""
"Resum d'errors\n"
"-------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
"S'ha intentat executar la transacció però no hi ha cap tasca a fer. S'està "
"sortint."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "S'està sortint de l'ordre de l'usuari"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "S'estan baixant els següents paquets:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "S'ha produït un error baixant els següents paquets:\n"
-#: ../cli.py:420 ../yum/__init__.py:3854
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "S'està executant rpm_check_debug"
-#: ../cli.py:429 ../yum/__init__.py:3863
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "S'ha produït un error. Necessiteu actualitzar el gestor rpm:"
-#: ../cli.py:431 ../yum/__init__.py:3866
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "S'ha produït un error amb rpm_check_debug contra depsolve:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "Cal actualitzar l'RPM"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Siusplau, informeu d'aquest error a %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "S'està executant la transacció de prova"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Ha acabat la transacció de prova"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "S'ha produït un error en la transacció de prova:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "La transacció de prova ha acabat amb èxit"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "S'està executant la transacció"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -215,79 +216,79 @@ msgstr ""
"No s'importaran automàticament les claus en una execució desatesa.\n"
"Feu servir \"-y\" per a importar les claus."
-#: ../cli.py:540 ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Potser volíeu dir: "
-#: ../cli.py:557 ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Paquets %s%s%s disponibles, però no instal·lats."
-#: ../cli.py:571 ../cli.py:602 ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "El paquet %s%s%s no està disponible."
-#: ../cli.py:607 ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Paquets a instal·lar"
-#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741
-#: ../yumcommands.py:157
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Res a fer"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paquets marcats per a actualitzar"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "No hi ha cap paquet marcat per a actualitzar"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paquets marcats per a suprimir"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "No hi ha cap paquet marcat per a suprimir"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Paquets per a desactualitzar"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (des de %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "El paquet instal·lat %s%s%s%s no està disponible."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Paquets a reinstal·lar"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "No s'ha proporcionat cap paquet"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Avís: no s'ha trobat cap coincidència per a: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "No s'ha trobat cap coincidència"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -297,109 +298,109 @@ msgstr ""
"fitxer.\n"
" Podeu usar \"%s*/%s%s\" i/o \"%s*bin/%s%s\" per obtenir aquest comportament"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "No s'ha trobat cap paquet per a %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "S'està netejant tot"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "S'estan netejant les capçaleres"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "S'estan netejant els paquets"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "S'estan netejant les metadades xml"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "S'està netejant la memòria cau de la base de dades"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "S'està netejant la memòria cau de metadades que han vençut"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "S'estan netejant els connectors"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Grups instal·lats:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Grups disponibles:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Fet"
-#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2560
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Avís: El grup %s no existeix."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"No hi ha cap paquet disponible per a instal·lar o actualitzar en els grups "
"sol·licitats"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paquets a instal·lar"
-#: ../cli.py:1012 ../yum/__init__.py:2572
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "No existeix cap grup anomenat %s"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "No hi ha cap paquet a suprimir dels grups"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paquets a suprimir"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "El paquet %s ja està instal·lat, s'ometrà"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "S'està descartant el paquet no comparable %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"No hi ha cap altre %s instal·lat, s'afegeix a la llista per a una possible "
"instal·lació"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Opcions del connector"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Error en la línia d'ordres: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -410,259 +411,259 @@ msgstr ""
"\n"
"%s: l'opció %s necessita un argument"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color pren un valor d'entre: auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "mostra el missatge d'ajuda i surt"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "sigues tolerant amb els errors"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "executa totalment des de la memòria cau, no l'actualitzis"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "ubicació del fitxer de configuració"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "temps màxim d'espera d'ordres"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "nivell de sortida de depuració"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "mostra duplicats, en repositoris, en les ordres per llistar i cercar"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "nivell de sortida d'error"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "operació silenciosa"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "operació descriptiva"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "respon sí a totes les preguntes"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "mostra la versió del Yum i surt"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "estableix l'arrel de la instal·lació"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "habilita un o més repositoris (es permeten caràcters de reemplaçament)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr ""
"deshabilita un o més repositoris (es permeten caràcters de reemplaçament)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "exclou els paquets per nom o expressió regular del glob"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "inhabilita l'exclusió des de l'inici, per a un repositori o per a tot"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "habilita el processament d'obsolets durant les actualitzacions"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "inhabilita els connectors de Yum"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "inhabilita la comprobació de signatures gpg"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "inhabilita els connectors pel seu nom"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "habilita els connectors pel seu nom"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "omet paquets amb problemes de resolució de dependències"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "controla sempre que s'usi color"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jan"
msgstr "Gen"
-#: ../output.py:303
+#: ../output.py:305
msgid "Feb"
msgstr "Feb"
-#: ../output.py:303
+#: ../output.py:305
msgid "Mar"
msgstr "Mar"
-#: ../output.py:303
+#: ../output.py:305
msgid "Apr"
msgstr "Abr"
-#: ../output.py:303
+#: ../output.py:305
msgid "May"
msgstr "Mai"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jun"
msgstr "Jun"
-#: ../output.py:304
+#: ../output.py:306
msgid "Jul"
msgstr "Jul"
-#: ../output.py:304
+#: ../output.py:306
msgid "Aug"
msgstr "Ago"
-#: ../output.py:304
+#: ../output.py:306
msgid "Sep"
msgstr "Set"
-#: ../output.py:304
+#: ../output.py:306
msgid "Oct"
msgstr "Oct"
-#: ../output.py:304
+#: ../output.py:306
msgid "Nov"
msgstr "Nov"
-#: ../output.py:304
+#: ../output.py:306
msgid "Dec"
msgstr "Des"
-#: ../output.py:314
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "S'està intentant un altre servidor rèplica."
-#: ../output.py:536
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Nom : %s%s%s"
-#: ../output.py:537
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Arq : %s"
-#: ../output.py:539
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Època : %s"
-#: ../output.py:540
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Versió : %s"
-#: ../output.py:541
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Release : %s"
-#: ../output.py:542
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Mida : %s"
-#: ../output.py:543
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:545
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Des del repo : %s"
-#: ../output.py:547
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Desenvolupador : %s"
-#: ../output.py:548
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Pujat : %s"
-#: ../output.py:549
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Temps de creació : %s"
-#: ../output.py:551
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Temps d'instal·lació: %s"
-#: ../output.py:552
+#: ../output.py:554
msgid "Summary : "
msgstr "Resum : "
-#: ../output.py:554
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:555
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Llicència : %s"
-#: ../output.py:556
+#: ../output.py:558
msgid "Description: "
msgstr "Descripció: "
-#: ../output.py:624
+#: ../output.py:626
msgid "y"
msgstr "s"
-#: ../output.py:624
+#: ../output.py:626
msgid "yes"
msgstr "sí"
-#: ../output.py:625
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:625
+#: ../output.py:627
msgid "no"
msgstr "no"
# REMEMBER to Translate [Y/N] to the current locale
-#: ../output.py:629
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "És correcte [s/N]: "
-#: ../output.py:720
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -671,142 +672,141 @@ msgstr ""
"\n"
"Grup: %s"
-#: ../output.py:724
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " Id de Grup: %s"
-#: ../output.py:729
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Descripció: %s"
-#: ../output.py:731
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Paquets obligatoris:"
-#: ../output.py:732
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Paquets per defecte:"
-#: ../output.py:733
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " Paquets opcionals:"
-#: ../output.py:734
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Paquets condicionals:"
-#: ../output.py:754
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "paquet: %s"
-#: ../output.py:756
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " No hi ha dependències per a aquest paquet"
-#: ../output.py:761
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " dependència: %s"
-#: ../output.py:763
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Dependència insatisfeta"
-#: ../output.py:835
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:836
+#: ../output.py:838
msgid "Matched from:"
msgstr "Coincidències amb:"
-#: ../output.py:845
+#: ../output.py:847
msgid "Description : "
msgstr "Descripció : "
-#: ../output.py:848
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:851
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Llicència : %s"
-#: ../output.py:854
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Fitxer : %s"
-#: ../output.py:858
+#: ../output.py:860
msgid "Other : "
msgstr "Altre : "
-#: ../output.py:891
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "S'ha produït un error en calcular la mida total de la descàrrega"
-#: ../output.py:896
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Mida total: %s"
-#: ../output.py:899
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Mida total de la descàrrega: %s"
-#: ../output.py:940
-#,
+#: ../output.py:942
msgid "Reinstalling"
msgstr "Tornant a instal·lar"
-#: ../output.py:941
+#: ../output.py:943
msgid "Downgrading"
msgstr "Desfent l'actualització"
-#: ../output.py:942
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "S'està instal·lant per dependències"
-#: ../output.py:943
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "S'està actualitzant degut a les dependències"
-#: ../output.py:944
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "S'està suprimint degut a les dependències"
-#: ../output.py:951 ../output.py:1063
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Ignorat degut a problemes de dependències:"
-#: ../output.py:974
+#: ../output.py:976
msgid "Package"
msgstr "Paquet"
-#: ../output.py:974
+#: ../output.py:976
msgid "Arch"
msgstr "Arq"
-#: ../output.py:975
+#: ../output.py:977
msgid "Version"
msgstr "Versió"
-#: ../output.py:975
+#: ../output.py:977
msgid "Repository"
msgstr "Repositori"
-#: ../output.py:976
+#: ../output.py:978
msgid "Size"
msgstr "Mida"
-#: ../output.py:988
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -815,7 +815,7 @@ msgstr ""
" s'està reemplaçant %s%s%s.%s %s\n"
"\n"
-#: ../output.py:997
+#: ../output.py:999
#, python-format
msgid ""
"\n"
@@ -826,7 +826,7 @@ msgstr ""
"Resum de la transacció\n"
"%s\n"
-#: ../output.py:1004
+#: ../output.py:1006
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
@@ -835,9 +835,8 @@ msgstr ""
"Instal·la %5.5s paquets\n"
"Actualitza %5.5s paquets\n"
-
-#: ../output.py:1013
-#, python-format //paraula downgrade
+#: ../output.py:1015
+#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
"Reinstall %5.5s Package(s)\n"
@@ -847,32 +846,32 @@ msgstr ""
"Reinstal·la %5.5s paquets\n"
"Desactualitza %5.5s paquets\n"
-#: ../output.py:1057
+#: ../output.py:1059
msgid "Removed"
msgstr "Suprimit"
-#: ../output.py:1058
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Dependència suprimida"
-#: ../output.py:1060
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Dependència instal·lada"
-#: ../output.py:1062
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Dependència actualitzada"
-#: ../output.py:1064
+#: ../output.py:1066
msgid "Replaced"
msgstr "Reemplaçat"
-#: ../output.py:1065
+#: ../output.py:1067
msgid "Failed"
msgstr "Ha fallat"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1131
+#: ../output.py:1133
msgid "two"
msgstr "dos"
@@ -880,7 +879,7 @@ msgstr "dos"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1142
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
@@ -889,85 +888,265 @@ msgid ""
"to exit.\n"
msgstr ""
"\n"
-" S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%s "
-"segons\n"
+" S'ha cancel·lat la descàrrega actual, %sinterromp (crtl-c) de nou%s en %s%s%"
+"s segons\n"
"per a sortir.\n"
-#: ../output.py:1153
+#: ../output.py:1155
msgid "user interrupt"
msgstr "interrupció de l'usuari"
-#: ../output.py:1171
+#: ../output.py:1173
msgid "Total"
msgstr "Total"
-#: ../output.py:1186
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "S'està executant la transacció"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "S'ha produït un error en la transacció de prova:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, fuzzy, python-format
+msgid "(%s seconds)"
+msgstr "%s segons (últim: %s)"
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Altre : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Obsolet"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Ha fallat"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "S'ha produït un error en la transacció de prova:\n"
+
+#: ../output.py:1405
+#, fuzzy
+msgid "Downgraded"
+msgstr "Desfent l'actualització"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "No s'ha proporcionat cap paquet"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Error: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "instal·lat"
-#: ../output.py:1187
+#: ../output.py:1525
msgid "updated"
msgstr "actualitzat"
-#: ../output.py:1188
+#: ../output.py:1526
msgid "obsoleted"
msgstr "obsolet"
-#: ../output.py:1189
+#: ../output.py:1527
msgid "erased"
msgstr "suprimit"
-#: ../output.py:1193
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paquet %s.%s %s:%s-%s passarà a ser %s"
-#: ../output.py:1200
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> S'està executant la transacció de prova"
-#: ../output.py:1205
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr ""
"--> Tornant a calcular la resolució de dependències amb els nous canvis."
-#: ../output.py:1210
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Ha finalitzat la resolució de dependències"
-#: ../output.py:1215 ../output.py:1220
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> S'està processant la dependència %s per al paquet: %s"
-#: ../output.py:1224
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Dependència no resolta: %s"
-#: ../output.py:1230 ../output.py:1235
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> S'està processant el conflicte: %s té un conflicte amb %s"
-#: ../output.py:1239
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
"--> S'està poblant la transacció amb els paquets sel·leccionats. Si us plau, "
"espereu."
-#: ../output.py:1243
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
"---> S'està baixant la capçalera per a %s per a empaquetar dins de la "
"transacció de prova."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"S'està sortint per la cancel·lació de l'usuari"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"S'està sortint en trobar la canonada trencada"
+
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Completat!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Heu de ser root per a executar aquesta ordre."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -987,8 +1166,7 @@ msgstr ""
"\n"
"Heu habilitat la comprovació de paquets utilitzant claus GPG. És una bona "
"opció. \n"
-"No obstant, no teniu cap clau pública GPG instal·lada. Necessiteu "
-"baixar\n"
+"No obstant, no teniu cap clau pública GPG instal·lada. Necessiteu baixar\n"
"les claus per als paquets que desitgeu instal·lar i instal·lar-les.\n"
"Podeu fer-ho executant l'ordre:\n"
" rpm --import clau.pública.gpg\n"
@@ -1001,338 +1179,337 @@ msgstr ""
"Per a més informació contacteu el vostre distribuïdor o proveïdor de "
"paquets.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Error: es necessita passar una llista de paquets a %s"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Error: es necessita algun element per comparar"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Error: es necessita un grup o una llista de grups"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Error: la neteja requereix una opció: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Error: argument invàlid per a la neteja: %r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "No hi ha arguments per a l'intèrpret d'ordres"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Nom del fitxer passat a l'intèrpret d'ordres: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr "El fitxer %s donat com a argument a l'intèrpret d'ordres no existeix."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
"Error: s'ha donat més d'un fitxer com a argument per a l'intèrpret d'ordres."
-#: ../yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAQUET..."
-#: ../yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Instal·la un o més paquets al vostre sistema"
-#: ../yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "S'està preparant el procés d'instal·lació"
-#: ../yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAQUET...]"
-#: ../yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "S'ha actualitzat un o més paquets al vostre sistema"
-#: ../yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "S'està preparant el procés d'actualització"
-#: ../yumcommands.py:244
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Mostra detalls sobre un paquet o un grup de paquets"
-#: ../yumcommands.py:293
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Paquets instal·lats"
-#: ../yumcommands.py:301
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Paquets disponibles"
-#: ../yumcommands.py:305
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Paquets extra"
-#: ../yumcommands.py:309
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Paquets actualitzats"
#. This only happens in verbose mode
-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:600
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Paquets obsolets"
-#: ../yumcommands.py:326
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Paquets recentment afegits"
-#: ../yumcommands.py:333
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "No hi ha paquets coincidents per llistar"
-#: ../yumcommands.py:347
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Llista un paquet o un grup de paquets"
-#: ../yumcommands.py:359
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Suprimeix un o més paquets del vostre sistema"
-#: ../yumcommands.py:366
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "S'està preparant el procés de supressió"
-#: ../yumcommands.py:380
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "S'està preparant el procés de grup"
-#: ../yumcommands.py:386
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "No hi ha cap grup on executar l'ordre"
-#: ../yumcommands.py:399
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Llista els grups de paquets disponibles"
-#: ../yumcommands.py:416
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Instal·la els paquets en un grup en el vostre sistema"
-#: ../yumcommands.py:438
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Suprimeix els paquets en un grup en el vostre sistema"
-#: ../yumcommands.py:465
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Mostra detalls sobre un grup de paquets"
-#: ../yumcommands.py:489
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Genera les metadades de la memòria cau"
-#: ../yumcommands.py:495
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr ""
"S'estan fent els fitxers de memòria cau per a tots els fitxers de metadades."
-#: ../yumcommands.py:496
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr "Això pot trigar una estona depenent de la velocitat d'aquest ordinador"
-#: ../yumcommands.py:517
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "S'han creat les metadades per a la memòria cau"
-#: ../yumcommands.py:531
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "S'han suprimit les dades de la memòria cau"
-#: ../yumcommands.py:551
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Troba quin paquet proporciona el valor donat"
-#: ../yumcommands.py:571
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Comprova si hi ha actualitzacions de paquets disponibles"
-#: ../yumcommands.py:620
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Busca detalls del paquet per la cadena donada"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "S'estan buscant paquets: "
-#: ../yumcommands.py:643
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Actualitza paquets tenint en compte els obsolets"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "S'està preparant el procés d'actualització"
-#: ../yumcommands.py:665
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Instal·la un RPM local"
-#: ../yumcommands.py:673
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "S'està configurant el procés local de paquets"
-#: ../yumcommands.py:692
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Determina quin paquet satisfà la dependència donada"
-#: ../yumcommands.py:695
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "S'estan buscant paquets per a la dependència:"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Executa un intèrpret d'ordres interactiu de yum"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "S'està preparant l'intèrpret d'ordres de yum"
-#: ../yumcommands.py:733
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Llista les dependències d'un paquet"
-#: ../yumcommands.py:739
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "S'estan trobant dependències: "
-#: ../yumcommands.py:755
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Mostra els repositoris de programari configurats"
-#: ../yumcommands.py:803 ../yumcommands.py:804
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "habilitat"
-#: ../yumcommands.py:812 ../yumcommands.py:813
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "deshabilitat"
-#: ../yumcommands.py:827
+#: ../yumcommands.py:834
msgid "Repo-id : "
msgstr "Id-repo : "
-#: ../yumcommands.py:828
+#: ../yumcommands.py:835
msgid "Repo-name : "
msgstr "Nom-repo : "
-#: ../yumcommands.py:829
+#: ../yumcommands.py:836
msgid "Repo-status : "
msgstr "Estat-repo : "
-#: ../yumcommands.py:831
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Repo-revisió : "
-#: ../yumcommands.py:835
+#: ../yumcommands.py:842
msgid "Repo-tags : "
msgstr "Repo-etiquetes : "
-#: ../yumcommands.py:841
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Repo-etiq-dist : "
-#: ../yumcommands.py:846
+#: ../yumcommands.py:853
msgid "Repo-updated : "
msgstr "Repo-actualitzat : "
-#: ../yumcommands.py:848
+#: ../yumcommands.py:855
msgid "Repo-pkgs : "
msgstr "Paquets-repo : "
-#: ../yumcommands.py:849
+#: ../yumcommands.py:856
msgid "Repo-size : "
msgstr "Mida-repo : "
-#: ../yumcommands.py:856
+#: ../yumcommands.py:863
msgid "Repo-baseurl : "
msgstr "URL-base-repo : "
-#: ../yumcommands.py:864
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Repo-metaenllaç : "
-#: ../yumcommands.py:868
-#,
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Actualitzat : "
-#: ../yumcommands.py:871
+#: ../yumcommands.py:878
msgid "Repo-mirrors : "
msgstr "Miralls-repo : "
-#: ../yumcommands.py:875 ../yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr "Desconegut"
-#: ../yumcommands.py:881
+#: ../yumcommands.py:888
#, python-format
msgid "Never (last: %s)"
msgstr "Mai (últim: %s)"
-#: ../yumcommands.py:883
+#: ../yumcommands.py:890
#, python-format
msgid "Instant (last: %s)"
msgstr "Temps d'instal·lació (últim: %s)"
-#: ../yumcommands.py:886
+#: ../yumcommands.py:893
#, python-format
msgid "%s second(s) (last: %s)"
msgstr "%s segons (últim: %s)"
-#: ../yumcommands.py:888
+#: ../yumcommands.py:895
msgid "Repo-expire : "
msgstr "Venç-repo : "
-#: ../yumcommands.py:891
+#: ../yumcommands.py:898
msgid "Repo-exclude : "
msgstr "Repo-exclou : "
-#: ../yumcommands.py:895
+#: ../yumcommands.py:902
msgid "Repo-include : "
msgstr "Repo-inclou : "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:905 ../yumcommands.py:931
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "id repo"
-#: ../yumcommands.py:919 ../yumcommands.py:920 ../yumcommands.py:934
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "estat"
-#: ../yumcommands.py:932
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "nom repo"
-#: ../yumcommands.py:958
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Mostra un missatge d'ajuda d'ús"
-#: ../yumcommands.py:992
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "No hi ha ajuda disponible per a %s"
-#: ../yumcommands.py:997
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1342,7 +1519,7 @@ msgstr ""
"\n"
"àlies: "
-#: ../yumcommands.py:999
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1352,66 +1529,66 @@ msgstr ""
"\n"
"àlies: "
-#: ../yumcommands.py:1027
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "S'està preparant el procés de reinstal·lació"
-#: ../yumcommands.py:1035
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "reinstal·la un paquet"
-#: ../yumcommands.py:1053
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "S'està preparant el procés de desactualització"
-#: ../yumcommands.py:1060
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "desactualitza un paquet"
-#: ../yumcommands.py:1074
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr "Mostra una versió per a la màquina i/o repositoris disponibles"
-#: ../yumcommands.py:1101
-#,
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " Id de Grup: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Paquet"
+
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "Instal·lat:"
-#: ../yumcommands.py:1110
-#,
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Instal·lat:"
+
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "Disponible:"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
-msgstr ""
-"\n"
-"\n"
-"S'està sortint per la cancel·lació de l'usuari"
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Disponible:"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
msgstr ""
-"\n"
-"\n"
-"S'està sortint en trobar la canonada trencada"
-#: ../yummain.py:50
+#: ../yumcommands.py:1239
#, python-format
-msgid ""
-"\n"
-"\n"
-"%s"
+msgid "Invalid history sub-command, use: %s."
msgstr ""
-"\n"
-"\n"
-"%s"
#: ../yummain.py:128
msgid "Running"
@@ -1500,11 +1677,7 @@ msgstr ""
"\n"
"Dependències resoltes"
-#: ../yummain.py:273
-msgid "Complete!"
-msgstr "Completat!"
-
-#: ../yummain.py:320
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1514,205 +1687,205 @@ msgstr ""
"\n"
"S'està sortint de l'ordre de l'usuari."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr ""
"S'està configurant TransactionSets abans que la classe de configuració "
"estigui iniciada"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Tsflag invàlid en el fitxer de configuració: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "S'està buscant pkgSack per a la dependència: %s"
-#: ../yum/depsolve.py:183
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Coincidència potencial per a %s de %s"
-#: ../yum/depsolve.py:191
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "La coincidència %s es requereix per a %s"
-#: ../yum/depsolve.py:232
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Membre: %s"
-#: ../yum/depsolve.py:246 ../yum/depsolve.py:756
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s convertits per a instal·lar"
-#: ../yum/depsolve.py:253
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "S'està afegint el paquet %s en mode %s"
-#: ../yum/depsolve.py:263
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "S'està suprimint el paquet %s"
-#: ../yum/depsolve.py:285
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s requereix: %s"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr ""
"El requeriment necessari ja s'ha buscat anteriorment, s'estan fent trampes"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "El requeriment necessari no és un nom de paquet. S'està buscant: %s"
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Proveïdor potencial: %s"
-#: ../yum/depsolve.py:383
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "El mode és %s per al proveïdor de %s: %s"
-#: ../yum/depsolve.py:387
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Mode per al paquet que proporciona %s: %s"
-#: ../yum/depsolve.py:391
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: el paquet %s requereix %s marcat per a suprimir"
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
"TSINFO: S'està marcant com a obsolet %s amb %s per resoldre dependències."
-#: ../yum/depsolve.py:407
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: S'està actualitzant %s per a resoldre dependències."
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "No es pot trobar un camí d'actualització de dependències per a: %s"
-#: ../yum/depsolve.py:425
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "No es pot resoldre el requeriment %s per a %s"
-#: ../yum/depsolve.py:448
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "La coincidència %s es requereix per a %s"
#. is it already installed?
-#: ../yum/depsolve.py:490
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
"%s es troba en els paquets proporcionats però ja es troba instal·lat, s'està "
"suprimint."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
"El paquet potencial que resol dependències %s té una instància nova a ts"
-#: ../yum/depsolve.py:517
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
"El paquet potencial que resol dependències %s té una nova instància "
"insta·lada."
-#: ../yum/depsolve.py:525 ../yum/depsolve.py:571
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Manca una dependència: %s es necessita per al paquet %s"
-#: ../yum/depsolve.py:538
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s ja es troba en ts, s'està ometent"
-#: ../yum/depsolve.py:581
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: S'està marcant %s com a actualització per a %s"
-#: ../yum/depsolve.py:589
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: S'està marcant %s com a instal·lació per a %s"
-#: ../yum/depsolve.py:692 ../yum/depsolve.py:774
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Èxit - transacció buida"
-#: ../yum/depsolve.py:731 ../yum/depsolve.py:746
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "S'està recomençant el bucle"
-#: ../yum/depsolve.py:762
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Està acabant el procés de dependències"
-#: ../yum/depsolve.py:768
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s de %s té problemes resolent dependències"
-#: ../yum/depsolve.py:775
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Èxit - dependències resoltes"
-#: ../yum/depsolve.py:789
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "S'estan comprobant les dependències per a %s"
-#: ../yum/depsolve.py:872
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "s'està buscant %s com a requeriment de %s"
-#: ../yum/depsolve.py:1014
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "S'està executant compare_providers() per a %s"
-#: ../yum/depsolve.py:1048 ../yum/depsolve.py:1054
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "millor arq en el po %s"
-#: ../yum/depsolve.py:1140
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s fa obsolet %s"
-#: ../yum/depsolve.py:1152
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1721,103 +1894,103 @@ msgstr ""
"archdist ha comparat %s amb %s a %s\n"
" Ha guanyat: %s"
-#: ../yum/depsolve.py:1159
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "rpm font comú %s i %s"
-#: ../yum/depsolve.py:1165
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "prefix comú de %s entre %s i %s"
-#: ../yum/depsolve.py:1173
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Millor ordre: %s"
-#: ../yum/__init__.py:180
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigsetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:401
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Falta el nom del repositori %r en la configuració, s'utilitzarà l'id"
-#: ../yum/__init__.py:439
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "els connectors ja estan inicialitzats"
-#: ../yum/__init__.py:446
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:457
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "S'està llegint un RPMDB local"
-#: ../yum/__init__.py:478
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:498
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() desapareixerà en una versió futura de Yum.\n"
-#: ../yum/__init__.py:528
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "S'estan configurant els sacs de paquets"
-#: ../yum/__init__.py:573
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "l'objecte repositori per al repositori %s no té un mètode _resetSack\n"
-#: ../yum/__init__.py:574
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "Aquest repositori no es pot reiniciar.\n"
-#: ../yum/__init__.py:579
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:591
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "S'està construint l'objecte d'actualitzacions"
-#: ../yum/__init__.py:626
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() desapareixerà en una futura versió de Yum.\n"
-#: ../yum/__init__.py:651
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "S'estan obtenint les metadades del grup"
-#: ../yum/__init__.py:677
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "S'està afegint el fitxer del grup des del repositori: %s"
-#: ../yum/__init__.py:686
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "No s'ha pogut afegir el fitxer dels grups des del repositori: %s - %s"
-#: ../yum/__init__.py:692
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "No hi ha cap grup disponible en cap repositori"
-#: ../yum/__init__.py:742
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "S'està important informació adicional de la llista de fitxers"
-#: ../yum/__init__.py:756
+#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr "El programa %s%s%s es troba en el paquet yum-utils."
-#: ../yum/__init__.py:764
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1825,17 +1998,17 @@ msgstr ""
"Encara hi ha transaccions sense acabar. Hauríeu de considerar executar yum-"
"complete-transaction abans per acabar-les."
-#: ../yum/__init__.py:832
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Intent %i d'omissió dels paquets trencats"
-#: ../yum/__init__.py:884
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "L'omissió dels paquets trencats ha necessitat %i intents"
-#: ../yum/__init__.py:885
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1843,74 +2016,80 @@ msgstr ""
"\n"
"Paquets omesos degut a problemes de dependències:"
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s des de %s"
-#: ../yum/__init__.py:1027
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Avís: ha fallat l'scriptlet o s'han produït altre tipus d'errors no fatals "
"durant la transacció."
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "No s'ha pogut suprimir el fitxer de transaccions %s"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "S'havia d'instal·lar %s però no s'ha realitzat!"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1110
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "S'havia de suprimir %s però no s'ha realitzat!"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1225
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "No s'ha pogut comprovar si el PID %s es troba actiu"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1229
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Bloqueig existent %s: una altra còpia s'està executant amb pid %s."
-#: ../yum/__init__.py:1306
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "El paquet no coincideix amb la descàrrega intentada"
-#: ../yum/__init__.py:1321
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "No s'ha pogut realitzar la suma de verificació"
-#: ../yum/__init__.py:1324
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "No coincideix la suma de verificació del paquet"
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"la suma de verificació del paquet falla però l'ús de memòria cau està "
"habilitat per a %s"
-#: ../yum/__init__.py:1369 ../yum/__init__.py:1398
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "s'està utilitzant la còpia local de %s"
-#: ../yum/__init__.py:1410
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1921,11 +2100,11 @@ msgstr ""
" * lliure %s\n"
" * necessari %s"
-#: ../yum/__init__.py:1459
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "La capçalera no està completa."
-#: ../yum/__init__.py:1496
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1933,62 +2112,62 @@ msgstr ""
"La capçalera no es troba en la memòria cau local i està habilitat el mode de "
"només memòria cau. No es pot baixar %s"
-#: ../yum/__init__.py:1551
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "La clau pública per a %s no està instal·lada"
-#: ../yum/__init__.py:1555
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Hi ha hagut un problema obrint el paquet %s"
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "La clau pública per a %s no és de confiança"
-#: ../yum/__init__.py:1567
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "El paquet %s no està signat"
-#: ../yum/__init__.py:1605
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "No es pot suprimir %s"
-#: ../yum/__init__.py:1609
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "S'ha suprimit %s"
-#: ../yum/__init__.py:1645
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "No es pot suprimir %s fitxer %s"
-#: ../yum/__init__.py:1649
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s fitxer %s suprimit"
-#: ../yum/__init__.py:1651
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s fitxers suprimits"
-#: ../yum/__init__.py:1720
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Hi ha més d'una coincidència idèntica en el sac per a %s"
-#: ../yum/__init__.py:1726
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "No hi ha coincidències %s.%s-%s:%s-%s de l'actualització"
-#: ../yum/__init__.py:1959
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1996,127 +2175,126 @@ msgstr ""
"searchPackages() desapareixerà en una futura versió de "
"Yum. Useu searchGenerator(). \n"
-#: ../yum/__init__.py:2001
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "S'estan buscant %d paquets"
-#: ../yum/__init__.py:2005
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "s'està buscant el paquet %s"
-#: ../yum/__init__.py:2017
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "s'està buscant en les entrades de fitxers"
-#: ../yum/__init__.py:2024
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "s'està buscant en les entrades proporcionades"
-#: ../yum/__init__.py:2057
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Proporciona-coincideix: %s"
-#: ../yum/__init__.py:2106
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "No hi ha dades de grup disponibles en cap dels repositoris configurats"
-#: ../yum/__init__.py:2137 ../yum/__init__.py:2156 ../yum/__init__.py:2187
-#: ../yum/__init__.py:2193 ../yum/__init__.py:2272 ../yum/__init__.py:2276
-#: ../yum/__init__.py:2586
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "No existeix cap grup anomenat %s"
-#: ../yum/__init__.py:2168 ../yum/__init__.py:2289
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "el paquet %s no estava marcat en el grup %s"
-#: ../yum/__init__.py:2215
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "S'està afegint el paquet %s del grup %s"
-#: ../yum/__init__.py:2219
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "No hi ha cap paquet anomenat %s disponible per a ser instal·lat"
-#: ../yum/__init__.py:2316
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "No s'ha pogut trobar la tupla de paquets %s al sac de paquets"
-#: ../yum/__init__.py:2330
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() desapareixarà, useu self.rpmdb.searchPkgTuple"
-"().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "No s'ha pogut trobar la tupla de paquets %s al sac de paquets"
-#: ../yum/__init__.py:2386 ../yum/__init__.py:2436
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Marcador de versió invàlid"
-#: ../yum/__init__.py:2406 ../yum/__init__.py:2411
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "No s'ha trobat cap paquet per a %s"
-#: ../yum/__init__.py:2627
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "L'objecte paquet no era una instància d'objecte paquet"
-#: ../yum/__init__.py:2631
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "No hi ha res especificat per a instal·lar"
-#: ../yum/__init__.py:2647 ../yum/__init__.py:3411
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
"S'està verificant si hi ha un proveïdor virtual o un fitxer proveïdor per a %"
"s"
-#: ../yum/__init__.py:2653 ../yum/__init__.py:2960 ../yum/__init__.py:3127
-#: ../yum/__init__.py:3417
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "No hi ha cap coincidència per a l'argument: %s"
-#: ../yum/__init__.py:2729
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "El paquet %s es troba instal·lat però no és disponible"
-#: ../yum/__init__.py:2732
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "No hi ha cap paquet disponible per a instal·lar"
-#: ../yum/__init__.py:2744
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "El paquet: %s - ja està en la transacció"
-#: ../yum/__init__.py:2770
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "El paquet %s és obsolet degut a %s, que ja està instal·lat"
-#: ../yum/__init__.py:2773
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s en el seu lloc"
+msgstr ""
+"El paquet %s és obsolet degut a %s, es provarà d'instal·lar %s en el seu lloc"
-#: ../yum/__init__.py:2781
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "El paquet %s ja es troba instal·lat i en l'última versió."
-#: ../yum/__init__.py:2795
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
@@ -2124,58 +2302,58 @@ msgstr ""
"actualització."
#. update everything (the easy case)
-#: ../yum/__init__.py:2889
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "S'està actualitzant tot"
-#: ../yum/__init__.py:2910 ../yum/__init__.py:3025 ../yum/__init__.py:3054
-#: ../yum/__init__.py:3081
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "No s'actualitzarà el paquet obsolet: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2945 ../yum/__init__.py:3124
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3016
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "El paquet és obsolet: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3049
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "No s'actualitzarà el paquet obsolet: %s"
-#: ../yum/__init__.py:3058 ../yum/__init__.py:3085
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "No s'actualitzarà el paquet actualitzat: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3140
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "No hi ha cap paquet coincident per a suprimir"
-#: ../yum/__init__.py:3173 ../yum/__init__.py:3277 ../yum/__init__.py:3366
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "No es pot obrir el fitxer %s. S'ometrà."
-#: ../yum/__init__.py:3176 ../yum/__init__.py:3280 ../yum/__init__.py:3369
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "S'està examinant %s: %s"
-#: ../yum/__init__.py:3184 ../yum/__init__.py:3283 ../yum/__init__.py:3372
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"No s'ha pogut afegir el paquet %s a la transacció. No és una arquitectura "
"compatible: %s"
-#: ../yum/__init__.py:3192
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2184,96 +2362,101 @@ msgstr ""
"El paquet %s no està instal·lat; no es pot actualitzar. Executeu «yum "
"install» per a instal·lar-lo."
-#: ../yum/__init__.py:3227 ../yum/__init__.py:3294 ../yum/__init__.py:3383
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "S'està excloent %s"
-#: ../yum/__init__.py:3232
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "S'està marcant %s per a ser instal·lat"
-#: ../yum/__init__.py:3238
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "S'està marcant %s com a actualització de %s"
-#: ../yum/__init__.py:3245
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s no actualitza el paquet instal·lat."
-#: ../yum/__init__.py:3313
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Hi ha un problema en reinstal·lar: no hi ha cap paquet marcat per a suprimir"
-#: ../yum/__init__.py:3326 ../yum/__init__.py:3444
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "El paquet %s permet múltiples instal·lacions, s'està ometent"
-#: ../yum/__init__.py:3347
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
"Hi ha un problema en reinstal·lar: no hi ha cap paquet %s marcat per a "
"instal·lar"
-#: ../yum/__init__.py:3436
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "No hi ha cap paquet disponible per a desactualitzar"
-#: ../yum/__init__.py:3480
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "No hi ha cap paquet disponible que coincideixi: %s"
-#: ../yum/__init__.py:3486
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Només hi ha una actualització disponible per al paquet: %s"
-#: ../yum/__init__.py:3545
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Paquets per a desactualitzar"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "S'està recuperant la clau GPG des de %s"
-#: ../yum/__init__.py:3565
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "La recuperació de la clau GPG ha fallat: "
-#: ../yum/__init__.py:3576
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "L'ànalisi de la clau GPG ha fallat: la clau no té el valor %s"
-#: ../yum/__init__.py:3608
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "La clau GPG de %s (0x%s) ja està instal·lada"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3613 ../yum/__init__.py:3675
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "S'està important la clau GPG 0x%s \"%s\" des de %s"
-#: ../yum/__init__.py:3630
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "No s'està instal·lant la clau"
-#: ../yum/__init__.py:3636
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "La importació de la clau ha fallat (codi %d)"
-#: ../yum/__init__.py:3637 ../yum/__init__.py:3696
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "La clau s'ha importat amb èxit"
-#: ../yum/__init__.py:3642 ../yum/__init__.py:3701
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2285,38 +2468,38 @@ msgstr ""
"Comproveu que les URL de claus correctes estan configurades per a aquest "
"repositori."
-#: ../yum/__init__.py:3651
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "La importació de claus no ha ajudat, eren claus incorrectes?"
-#: ../yum/__init__.py:3670
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "La clau GPG a %s (0x%s) ja ha estat importada"
-#: ../yum/__init__.py:3690
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "No s'està instal·lant la clau per al repositori %s"
-#: ../yum/__init__.py:3695
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Ha fallat la importació de la clau"
-#: ../yum/__init__.py:3816
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "No s'ha pogut trobar un servidor rèplica vàlid."
-#: ../yum/__init__.py:3818
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "S'han trobat errors baixant paquets."
-#: ../yum/__init__.py:3868
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Siusplau, informeu d'aquest error al %s"
-#: ../yum/__init__.py:3892
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Errors en la transacció de prova: "
@@ -2376,7 +2559,7 @@ msgstr "No s'ha trobat el fitxer de configuració %s"
msgid "Unable to find configuration file for plugin %s"
msgstr "No s'ha pogut trobar un fitxer de configuració per al connector %s"
-#: ../yum/plugins.py:497
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "l'enregistrament d'ordres no està suportat"
@@ -2415,6 +2598,13 @@ msgstr "Capçalera malmesa %s"
msgid "Error opening rpm %s - error %s"
msgstr "S'ha produït un error en obrir l'rpm %s - error %s"
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() desapareixarà, useu self.rpmdb.searchPkgTuple"
+#~ "().\n"
+
#~ msgid "Matching packages for package list to user args"
#~ msgstr ""
#~ "S'està comparant els paquets per a la llista de paquets amb els arguments "
diff --git a/po/cs.po b/po/cs.po
index 18305e3..d369345 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,10 +6,10 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-29 09:25+0000\n"
-"PO-Revision-Date: 2009-09-29 17:44+0200\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
+"PO-Revision-Date: 2009-10-15 15:30+0200\n"
"Last-Translator: Adam Pribyl <pribyl@lowlevel.cz>\n"
-"Language-Team: Czech <fedora-cs-list@redhat.com>\n"
+"Language-Team: American English <fedora-cs-list@redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -33,16 +33,16 @@ msgstr "Instaluje se"
msgid "Obsoleted"
msgstr "Zastaralé"
-#: ../callback.py:54 ../output.py:1063 ../output.py:1401
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Aktualizováno"
-#: ../callback.py:55 ../output.py:1397
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Smazáno"
#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
-#: ../output.py:1393
+#: ../output.py:1395
msgid "Installed"
msgstr "Nainstalováno"
@@ -72,60 +72,60 @@ msgstr "Odstraňuje se"
msgid "Cleanup"
msgstr "Čiští se"
-#: ../cli.py:108
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Přikaz \"%s\" již definován"
-#: ../cli.py:120
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Nastavují se repozitáře"
-#: ../cli.py:131
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Načítají se metadata repozitářů z lokálních souborů"
-#: ../cli.py:194 ../utils.py:102
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Chyba konfigurace: %s"
-#: ../cli.py:197 ../cli.py:1253 ../utils.py:105
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Chybná volba: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Nainstalováno: %s-%s na %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Sestaveno : %s na %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Odesláno : %s na %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Musíte zadat nějaký příkaz"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Diskové požadavky:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Je potřeba alespoň %dMB na souborovém systému %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -133,64 +133,64 @@ msgstr ""
"Přehled chyb\n"
"------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Pokus o spuštění transakce, ale není co dělat. Ukončeno."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Ukončeno na přikaz uživatele"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Stahují se balíčky:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Chyba stahování balíčků:\n"
-#: ../cli.py:420 ../yum/__init__.py:3995
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Spuští se rpm_check_debug"
-#: ../cli.py:429 ../yum/__init__.py:4004
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "CHYBA Je potřeba aktualizovat rpm k provedení:"
-#: ../cli.py:431 ../yum/__init__.py:4007
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "CHYBA v rpm_check_debug vs depsolve:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "Je potřeba aktualizovat RPM"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
-msgstr "Prosím nahlašte tuto chybu v %s"
+msgstr "Oznamte prosím tuto chybu v %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Spouští se test transakcí"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Test transakcí dokončen"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Chyba při kontrole transakcí:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Test transakcí uspěl"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Spouští se transakce"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -198,79 +198,79 @@ msgstr ""
"Nelze automaticky importovat klíče při spuštění bez obsluhy.\n"
"Použite \"-y\" k potlačení."
-#: ../cli.py:540 ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Možná jste myslel: "
-#: ../cli.py:557 ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
-msgstr "Balíček(y) %s%s%s dostupné, ale nenainstalované."
+msgstr "Balíček(y) %s%s%s dostupný/é, ale nenainstalovaný/é."
-#: ../cli.py:571 ../cli.py:602 ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
-msgstr "Žádné dostupné balíčky %s%s%s."
+msgstr "Balíček %s%s%s není dostupný."
-#: ../cli.py:607 ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Balíček(y) k instalaci"
-#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Není co dělat"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d balíčků označeno k aktualizaci"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Žádné balíčky označené k aktualizaci"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d balíčků označeno ke smazání"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Žádné balíčky označené k odstranění"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Balíček(y) ke snížení verze"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (z %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Instalované balíčky %s%s%s%s nejsou dostupné"
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Balíček(y) k reinstalaci"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Žádný balíček neposkytuje"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Varování: Žádný balíček odpovídající: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Nebyla nalezena shoda"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -279,106 +279,106 @@ msgstr ""
"Varování: 3.0.x verze yumu by chybně hledala shodu se jménem souboru.\n"
" Můžete použít \"%s*/%s%s\" a/nebo \"%s*bin/%s%s\" k dosažení tohoto chování"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Nebyly nalezeny balíčky pro %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Čistí se vše"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Čistí se hlavičky"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Čistí se balíčky"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Čistí se XML metadata"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Čistí se skladiště databáze"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Čistí se vypršelá metadata ze skladiště"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Čistí se zásuvné moduly"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Naintalované skupiny:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Dostupné skupiny:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Dokončeno"
-#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2621
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Varování: skupina %s neexistuje."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
-"V žádné s požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci"
+"V žádné z požadovaných skupin nejsou balíčky k instalaci nebo aktualizaci"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d balíček(ů) k instalaci"
-#: ../cli.py:1012 ../yum/__init__.py:2633
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Neexistuje skupina se jménem %s"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Žádné balíčky k odstranění ve skupině"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d balíček(ů) k odstranění"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
-msgstr "Balíček %s je již nainstalován, přeskakuji."
+msgstr "Balíček %s je již nainstalován, přeskakuje se"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Skartuje se neporovnatelný balíček %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr "Žádný jiný %s nainstalován, přidán do seznamu k potenciální instalaci"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Možnosti zásuvného modulu"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Chyba příkazové řádky: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -389,103 +389,103 @@ msgstr ""
"\n"
"%s: %s volba vyžaduje argument"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color přijímá jeden z: auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
-msgstr "ukázat tuto nápovedu a skončit"
+msgstr "ukázat tuto nápovědu a skončit"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "tolerovat chyby"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "spustit vše z neaktualizovaného skladiště"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "umístění konfiguračního souboru"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "maximální čas čekání na příkaz"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "úroveň výstupních ladících informací"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "ukázat duplikáty v repozitářích, v list/search příkazech"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "úroveň výstupu chyb"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "tichý chod"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "užvaněný chod"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "odpovědět ano na všechny otázky"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "ukázat verzi yumu a skončit"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "nastavit kořen instalace "
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "povolit jeden nebo více repozitářů (zástupné znaky povoleny)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "zakázat jeden nebo více repozitářů (zástupné znaky povoleny)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "vyřadit balíček(y) podle jména nebo globálně"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
-msgstr "zakázat vyřazení z hlavní části pro repozitář nebo pro vše"
+msgstr "zakázat vyřazení z hlavní části, pro repozitář nebo pro vše"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "povolit zpracování zastaralých během aktualizací"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "zakázat zásuvné moduly yumu"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "zakázat kontrolu GPG podpisů"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "zakázat zásuvné moduly podle jména"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "povolit zásuvné moduly podle jména"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "přeskočit balíčky s problémy v závislostech"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "kontrola zda jsou použity barvy"
@@ -579,27 +579,27 @@ msgstr "Repo : %s"
#: ../output.py:547
#, python-format
msgid "From repo : %s"
-msgstr "Z repa : %s"
+msgstr "Z repa : %s"
#: ../output.py:549
#, python-format
msgid "Committer : %s"
-msgstr "Potvrzeno : %s"
+msgstr "Vloženo : %s"
#: ../output.py:550
#, python-format
msgid "Committime : %s"
-msgstr "Čas povrzení : %s"
+msgstr "Čas vložení : %s"
#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
-msgstr "Čas sestavení : %s"
+msgstr "Sestaveno : %s"
#: ../output.py:553
#, python-format
msgid "Installtime: %s"
-msgstr "Čas instalace : %s"
+msgstr "Instalováno: %s"
#: ../output.py:554
msgid "Summary : "
@@ -617,7 +617,7 @@ msgstr "Licence : %s"
#: ../output.py:558
msgid "Description: "
-msgstr "Popis :"
+msgstr "Popis : "
#: ../output.py:626
msgid "y"
@@ -726,7 +726,7 @@ msgstr "Další : "
#: ../output.py:893
msgid "There was an error calculating total download size"
-msgstr "Pří výpočtu celkové velikosti stahování nastala chyba"
+msgstr "Při výpočtu celkové velikosti stahování nastala chyba"
#: ../output.py:898
#, python-format
@@ -780,7 +780,7 @@ msgstr "Repozitář"
#: ../output.py:978
msgid "Size"
-msgstr "Velikost"
+msgstr "Vel."
#: ../output.py:990
#, python-format
@@ -808,7 +808,7 @@ msgid ""
"Install %5.5s Package(s)\n"
"Upgrade %5.5s Package(s)\n"
msgstr ""
-"Instalace %5.5s balíčku/ů\n"
+"Instalace %5.5s balíčku/ů\n"
"Aktualizace %5.5s balíčku/ů\n"
#: ../output.py:1015
@@ -818,9 +818,9 @@ msgid ""
"Reinstall %5.5s Package(s)\n"
"Downgrade %5.5s Package(s)\n"
msgstr ""
-"Odstraňení %5.5s balíčku/ů\n"
+"Odstranění %5.5s balíčku/ů\n"
"Reinstalace %5.5s balíčku/ů\n"
-"Snížení verze %5.5s balíčku/ů\n"
+"Snížení verze %5.5s balíčku/ů\n"
#: ../output.py:1059
msgid "Removed"
@@ -865,8 +865,7 @@ msgid ""
msgstr ""
"\n"
" Aktuální stahování přerušeno, %spřerušte (ctrl-c) znovu%s během %s%s%s "
-"sekund\n"
-"pro ukončení.\n"
+"sekund pro ukončení.\n"
#: ../output.py:1155
msgid "user interrupt"
@@ -876,190 +875,199 @@ msgstr "Přerušeno uživatelem"
msgid "Total"
msgstr "Celkem"
-#: ../output.py:1201
+#: ../output.py:1203
msgid "<unset>"
msgstr "<nenastaveno>"
-#: ../output.py:1202
+#: ../output.py:1204
msgid "System"
msgstr "Systém"
-#: ../output.py:1238
+#: ../output.py:1240
msgid "Bad transaction IDs, or package(s), given"
msgstr "Zadáné špatné ID transakce nebo balíčku/ů"
-#: ../output.py:1282 ../yumcommands.py:1148 ../yum/__init__.py:1060
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
msgid "Warning: RPMDB has been altered since the last yum transaction."
msgstr "Varování: RPMDB byla od poslední yum transakce změněna"
-#: ../output.py:1287
+#: ../output.py:1289
msgid "No transaction ID given"
msgstr "Nezadáno ID transakce"
-#: ../output.py:1295
+#: ../output.py:1297
msgid "Bad transaction ID given"
msgstr "Špatné ID transakce"
-#: ../output.py:1300
+#: ../output.py:1302
msgid "Not found given transaction ID"
msgstr "Zadané ID transakce nenalezeno"
-#: ../output.py:1308
+#: ../output.py:1310
msgid "Found more than one transaction ID!"
msgstr "Nalezeno více než jedno ID transakce!"
-#: ../output.py:1329
+#: ../output.py:1331
msgid "No transaction ID, or package, given"
msgstr "Nebylo zadáno ID transakce nebo balíčku/ů"
-#: ../output.py:1355
+#: ../output.py:1357
msgid "Transaction ID :"
msgstr "ID transakce:"
-#: ../output.py:1357
+#: ../output.py:1359
msgid "Begin time :"
-msgstr "Čas startu :"
+msgstr "Počáteční čas :"
-#: ../output.py:1360 ../output.py:1362
+#: ../output.py:1362 ../output.py:1364
msgid "Begin rpmdb :"
msgstr "Začátek rpmdb :"
-#: ../output.py:1376, python-format
+#: ../output.py:1378
+#, python-format
msgid "(%s seconds)"
msgstr "(%s sekund)"
-#: ../output.py:1377
+#: ../output.py:1379
msgid "End time :"
-msgstr "Konečný čas :"
+msgstr "Konečný čas :"
-#: ../output.py:1380 ../output.py:1382
+#: ../output.py:1382 ../output.py:1384
msgid "End rpmdb :"
msgstr "Konec rpmdb :"
-#: ../output.py:1383
+#: ../output.py:1385
msgid "User :"
msgstr "Uživatel :"
-#: ../output.py:1385 ../output.py:1387 ../output.py:1389
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
msgid "Return-Code :"
-msgstr "Vrácený kód :"
+msgstr "Návratový kód :"
-#: ../output.py:1385
+#: ../output.py:1387
msgid "Aborted"
msgstr "Přerušeno"
-#: ../output.py:1387
+#: ../output.py:1389
msgid "Failure:"
msgstr "Selhalo:"
-#: ../output.py:1389
+#: ../output.py:1391
msgid "Success"
msgstr "Úspěch"
-#: ../output.py:1390
-msgid "Transaction performed with :"
-msgstr "Transakce proběhla s :"
+#: ../output.py:1392
+msgid "Transaction performed with:"
+msgstr "Transakce proběhla s:"
-#: ../output.py:1403
+#: ../output.py:1405
msgid "Downgraded"
msgstr "Snížena verze"
#. multiple versions installed, both older and newer
-#: ../output.py:1405
+#: ../output.py:1407
msgid "Weird"
msgstr "Divné"
-#: ../output.py:1407
+#: ../output.py:1409
msgid "Packages Altered:"
msgstr "Pozměněné balíčky:"
-#: ../output.py:1475
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr "Výstup skriptletu:"
+
+#: ../output.py:1418
+msgid "Errors:"
+msgstr "Chyby:"
+
+#: ../output.py:1489
msgid "Last day"
msgstr "Poslední den"
-#: ../output.py:1476
+#: ../output.py:1490
msgid "Last week"
msgstr "Poslední týden"
-#: ../output.py:1477
+#: ../output.py:1491
msgid "Last 2 weeks"
msgstr "Poslední 2 týdny"
#. US default :p
-#: ../output.py:1478
+#: ../output.py:1492
msgid "Last 3 months"
msgstr "Poslední 3 měsíce"
-#: ../output.py:1479
+#: ../output.py:1493
msgid "Last 6 months"
msgstr "Posledních 6 měsíců"
-#: ../output.py:1480
+#: ../output.py:1494
msgid "Last year"
msgstr "Poslední rok"
-#: ../output.py:1481
+#: ../output.py:1495
msgid "Over a year ago"
msgstr "Více než rok"
-#: ../output.py:1510
+#: ../output.py:1524
msgid "installed"
-msgstr "nainstalováno"
+msgstr "instalaci"
-#: ../output.py:1511
+#: ../output.py:1525
msgid "updated"
-msgstr "aktualizováno"
+msgstr "aktualizaci"
-#: ../output.py:1512
+#: ../output.py:1526
msgid "obsoleted"
-msgstr "zastaralo"
+msgstr "zastarání"
-#: ../output.py:1513
+#: ../output.py:1527
msgid "erased"
-msgstr "vymazáno"
+msgstr "smazání"
-#: ../output.py:1517
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
-msgstr "---> Balíček %s.%s %s:%s-%s nastaven k/ke %s"
+msgstr "---> Balíček %s.%s %s:%s-%s nastaven k %s"
-#: ../output.py:1524
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Spouští se kontrola transakce"
-#: ../output.py:1529
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Restartuje se řešení závislostí s novými změnami."
-#: ../output.py:1534
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Řešení závislostí dokončeno"
-#: ../output.py:1539 ../output.py:1544
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Zpracování závislosti: %s pro balíček: %s"
-#: ../output.py:1548
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nevyřešená závislost: %s"
-#: ../output.py:1554 ../output.py:1559
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Zpracování konfliktu: %s je v konfliktu s %s"
-#: ../output.py:1563
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
-msgstr "--> Přidávají se do transakce vybrané balíčky. Prosím čekejte."
+msgstr "--> Do transakční sady se přidávají vybrané balíčky. Čekejte prosím."
-#: ../output.py:1567
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Stahují se hlavičky %s pro přidání do transakce."
-#: ../utils.py:132 ../yummain.py:42
+#: ../utils.py:137 ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1069,7 +1077,7 @@ msgstr ""
"\n"
"Ukončeno na základě pokynu uživatele"
-#: ../utils.py:138 ../yummain.py:48
+#: ../utils.py:143 ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1079,7 +1087,8 @@ msgstr ""
"\n"
"Ukončeno kvůli nefunkční rouře"
-#: ../utils.py:140 ../yummain.py:50, python-format
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
msgid ""
"\n"
"\n"
@@ -1089,7 +1098,7 @@ msgstr ""
"\n"
"%s"
-#: ../utils.py:179 ../yummain.py:273
+#: ../utils.py:184 ../yummain.py:273
msgid "Complete!"
msgstr "Hotovo!"
@@ -1118,15 +1127,15 @@ msgstr ""
"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 blíček, který si přejete nainstalovat a přidat jej příkazem.\n"
+"pro balíček, který si přejete nainstalovat a přidat jej příkazem\n"
" rpm --import public.gpg.key\n"
"\n"
"\n"
"Jako druhou možnost můžete uvést URL ke klíči, který chcete použít\n"
-"pro repozitář ve volbě 'gpgkey' v nastavení repozitáře a yum\n"
+"pro repozitář ve volbě 'gpgkey' v nastavení repozitáře, a yum\n"
"jej nainstaluje.\n"
"\n"
-"Pro více informací kontaktujte vašeho distributora nebo správce balíčku.\n"
+"Více informací získáte u svého distributora nebo správce balíčku.\n"
#: ../yumcommands.py:69
#, python-format
@@ -1158,7 +1167,7 @@ msgstr "Shell nemá žádný argument"
#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
-msgstr "Jméno souboru předané shelu: %s"
+msgstr "Jméno souboru předané shellu: %s"
#: ../yumcommands.py:114
#, python-format
@@ -1175,11 +1184,11 @@ msgstr "Balíček..."
#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
-msgstr "Nainstalujte balíček nebo balíčky do vašeho systému"
+msgstr "Instalovat balíček nebo balíčky do vašeho systému"
#: ../yumcommands.py:180
msgid "Setting up Install Process"
-msgstr "Uspořádává se instalační průběh"
+msgstr "Uspořádává se průběh instalace"
#: ../yumcommands.py:191
msgid "[PACKAGE...]"
@@ -1187,7 +1196,7 @@ msgstr "[Balíček...]"
#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
-msgstr "Aktualizujte balíček nebo balíčky na vašem systému"
+msgstr "Aktualizovat balíček nebo balíčky na vašem systému"
#: ../yumcommands.py:201
msgid "Setting up Update Process"
@@ -1199,7 +1208,7 @@ msgstr "Zobrazit detaily o balíčku nebo skupině balíčků"
#: ../yumcommands.py:295
msgid "Installed Packages"
-msgstr "Instalované balíčky"
+msgstr "Nainstalované balíčky"
#: ../yumcommands.py:303
msgid "Available Packages"
@@ -1214,7 +1223,7 @@ msgid "Updated Packages"
msgstr "Aktualizované balíčky"
#. This only happens in verbose mode
-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:602
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Zastaralé balíčky"
@@ -1268,11 +1277,11 @@ msgstr "Vygenerovat skladiště metadat"
#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
-msgstr "Vytváří se skladišťové soubory pro všechna metadata "
+msgstr "Vytváří se skladištní soubory pro všechna metadata "
#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
-msgstr "Může to chvíli trvat v závislosti na rychosti tohoto počítače"
+msgstr "Může to chvíli trvat v závislosti na rychlosti tohoto počítače"
#: ../yumcommands.py:519
msgid "Metadata Cache Created"
@@ -1288,175 +1297,175 @@ msgstr "Nalézt balíček, který poskytuje danou hodnotu"
#: ../yumcommands.py:573
msgid "Check for available package updates"
-msgstr "Zkontrolovat dostupné aktualizace balíčku"
+msgstr "Zkontrolovat dostupné aktualizace balíčků"
-#: ../yumcommands.py:622
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Nalézt detaily balíčku pro daný řetězec"
-#: ../yumcommands.py:628
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Prohledávají se balíčky: "
-#: ../yumcommands.py:645
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Aktualizovat balíčky a brát v úvahu zastaralé"
-#: ../yumcommands.py:653
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Upořádává se průběh aktualizace"
-#: ../yumcommands.py:667
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Instalovat lokální RPM"
-#: ../yumcommands.py:675
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Uspořádává se zpracování lokálního balíčku"
-#: ../yumcommands.py:694
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Určit který balíček poskytuje danou závislost"
-#: ../yumcommands.py:697
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Prohledávají se balíčky kvůli závislostem:"
-#: ../yumcommands.py:711
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Spustit interaktivní shell yum"
-#: ../yumcommands.py:717
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Nastavuje se yum shell"
-#: ../yumcommands.py:735
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Zobrazit závislosti balíčku"
-#: ../yumcommands.py:741
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
-msgstr "Hledají se závíslosti: "
+msgstr "Hledají se závislosti: "
-#: ../yumcommands.py:757
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
-msgstr "Zobrazit nastavené softwarová repozitáře"
+msgstr "Zobrazit nastavené repozitáře softwaru"
-#: ../yumcommands.py:809 ../yumcommands.py:810
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "povoleno"
-#: ../yumcommands.py:818 ../yumcommands.py:819
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "zakázáno"
-#: ../yumcommands.py:833
+#: ../yumcommands.py:834
msgid "Repo-id : "
msgstr "Repo-id : "
-#: ../yumcommands.py:834
+#: ../yumcommands.py:835
msgid "Repo-name : "
msgstr "Repo-jméno : "
-#: ../yumcommands.py:835
+#: ../yumcommands.py:836
msgid "Repo-status : "
msgstr "Repo-status : "
-#: ../yumcommands.py:837
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Repo-revize : "
-#: ../yumcommands.py:841
+#: ../yumcommands.py:842
msgid "Repo-tags : "
msgstr "Repo-tagy : "
-#: ../yumcommands.py:847
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Repo-distro-tagy: "
-#: ../yumcommands.py:852
+#: ../yumcommands.py:853
msgid "Repo-updated : "
msgstr "Repo-aktuální: "
-#: ../yumcommands.py:854
+#: ../yumcommands.py:855
msgid "Repo-pkgs : "
msgstr "Repo-bal. : "
-#: ../yumcommands.py:855
+#: ../yumcommands.py:856
msgid "Repo-size : "
msgstr "Repo-velikost: "
-#: ../yumcommands.py:862
+#: ../yumcommands.py:863
msgid "Repo-baseurl : "
msgstr "Repo-baseurl : "
-#: ../yumcommands.py:870
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Repo-metalink: "
-#: ../yumcommands.py:874
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Aktualizováno: "
-#: ../yumcommands.py:877
+#: ../yumcommands.py:878
msgid "Repo-mirrors : "
msgstr "Repo-zrcadla : "
-#: ../yumcommands.py:881 ../yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr "Neznámý"
-#: ../yumcommands.py:887
+#: ../yumcommands.py:888
#, python-format
msgid "Never (last: %s)"
msgstr "Nikdy (poslední: %s)"
-#: ../yumcommands.py:889
+#: ../yumcommands.py:890
#, python-format
msgid "Instant (last: %s)"
msgstr "Okamžitě (naposledy: %s)"
-#: ../yumcommands.py:892
+#: ../yumcommands.py:893
#, python-format
msgid "%s second(s) (last: %s)"
msgstr "%s sekund (naposledy: %s)"
-#: ../yumcommands.py:894
+#: ../yumcommands.py:895
msgid "Repo-expire : "
msgstr "Repo-vyprší : "
-#: ../yumcommands.py:897
+#: ../yumcommands.py:898
msgid "Repo-exclude : "
msgstr "Repo-vyřazeno: "
-#: ../yumcommands.py:901
+#: ../yumcommands.py:902
msgid "Repo-include : "
msgstr "Repo-zahrnuto: "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:911 ../yumcommands.py:937
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "repo id"
-#: ../yumcommands.py:925 ../yumcommands.py:926 ../yumcommands.py:940
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "status"
-#: ../yumcommands.py:938
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "jméno repa"
-#: ../yumcommands.py:964
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Zobrazit užitečnou nápovědu"
-#: ../yumcommands.py:998
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Není dostupná nápověda pro %s"
-#: ../yumcommands.py:1003
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1466,7 +1475,7 @@ msgstr ""
"\n"
"aliasy: "
-#: ../yumcommands.py:1005
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1476,59 +1485,59 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:1033
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Uspořádává se průběh reinstalace"
-#: ../yumcommands.py:1041
+#: ../yumcommands.py:1042
msgid "reinstall a package"
-msgstr "reinstalace balíčku"
+msgstr "Reinstalace balíčku"
-#: ../yumcommands.py:1059
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Uspořádává se průběh snížení verze"
-#: ../yumcommands.py:1066
+#: ../yumcommands.py:1067
msgid "downgrade a package"
-msgstr "snížení verze balíčku"
+msgstr "Snížení verze balíčku"
-#: ../yumcommands.py:1080
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr "Zobrazit verzi pro tento počítač a/nebo dostupné repozitáře."
-#: ../yumcommands.py:1110
+#: ../yumcommands.py:1111
msgid " Yum version groups:"
msgstr " Verze yum skupin:"
-#: ../yumcommands.py:1120
+#: ../yumcommands.py:1121
msgid " Group :"
msgstr " Skupina :"
-#: ../yumcommands.py:1121
+#: ../yumcommands.py:1122
msgid " Packages:"
msgstr " Balíčky :"
-#: ../yumcommands.py:1151
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "Nainstalováno:"
-#: ../yumcommands.py:1156
+#: ../yumcommands.py:1157
msgid "Group-Installed:"
msgstr "Nainstalované skupiny:"
-#: ../yumcommands.py:1165
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "Dostupné:"
-#: ../yumcommands.py:1171
+#: ../yumcommands.py:1172
msgid "Group-Available:"
msgstr "Dostupné skupiny:"
-#: ../yumcommands.py:1210
+#: ../yumcommands.py:1211
msgid "Display, or use, the transaction history"
msgstr "Zobrazit nebo používat transakční historii"
-#: ../yumcommands.py:1238
+#: ../yumcommands.py:1239
#, python-format
msgid "Invalid history sub-command, use: %s."
msgstr "Neplatný pod-příkaz historie, použijte: %s."
@@ -1629,146 +1638,146 @@ msgstr ""
"\n"
"Ukončeno na pokyn uživatele."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() bude v následujících verzích yumu odstraněno.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
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"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Neplatný tsflag v konfiguračním souboru: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Hledá se pkgSack pro závislost: %s"
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Potenciálně shodné pro %s z %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Shoda %s vyžadovaná pro %s"
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Prvek: %s"
-#: ../yum/depsolve.py:239 ../yum/depsolve.py:749
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s zkonvertován na instalaci"
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Přidává se balíček %s v módu %s"
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Odstraňuje se balíček %s"
-#: ../yum/depsolve.py:278
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s vyžaduje: %s"
-#: ../yum/depsolve.py:336
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Závazné požadavky již byly prohledány, švindluje se"
-#: ../yum/depsolve.py:346
+#: ../yum/depsolve.py:345
#, 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"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Možný poskytovatel: %s"
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Mód je %s pro poskytovatele %s: %s"
-#: ../yum/depsolve.py:380
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Mód pro bal. poskytující %s: %s"
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: %s balíček požaduje %s označený ke smazání"
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:396
#, 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í."
-#: ../yum/depsolve.py:400
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Aktualizuji %s k vyřešení závislostí."
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Nelze nalézt cestu aktualizací pro závislost pro: %s"
-#: ../yum/depsolve.py:418
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Neřešitelný požadavek %s pro %s"
-#: ../yum/depsolve.py:441
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Rychlá shoda %s vyžadovaného pro %s"
#. is it already installed?
-#: ../yum/depsolve.py:483
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
"%s je v poskytujících balíčcích, ale je již nainstalován, odstraňuje se."
-#: ../yum/depsolve.py:499
+#: ../yum/depsolve.py:498
#, 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á v ts novější verzi."
-#: ../yum/depsolve.py:510
+#: ../yum/depsolve.py:509
#, 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í, je nainstalován v novější verzi."
-#: ../yum/depsolve.py:518 ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Chybí závislost: %s je vyžadován balíčkem %s"
-#: ../yum/depsolve.py:531
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s je již v ts, vynechává se"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Označuji %s jako aktualizaci %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Označuji %s jako instalaci %s"
@@ -1854,7 +1863,7 @@ msgstr "Repozitáři %r chybí jméno v konfiguraci, používá se id"
#: ../yum/__init__.py:450
msgid "plugins already initialised"
-msgstr "zásuvný modul již inicializován"
+msgstr "zásuvný modul je již inicializován"
#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
@@ -1883,7 +1892,7 @@ msgstr "objekt repozitáře pro repo %s postrádá metodu _resetSack\n"
#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
-msgstr "proto nemůže toto repo být resetován.\n"
+msgstr "proto nemůže toto repo být resetováno.\n"
#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
@@ -1922,7 +1931,7 @@ msgstr "Importuji informace z dodatečného seznamu souborů"
#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
-msgstr "Program %s %s %s byl nalezen v balíčku yum-utils."
+msgstr "Program %s%s%s byl nalezen v balíčku yum-utils."
#: ../yum/__init__.py:785
msgid ""
@@ -1946,79 +1955,81 @@ msgstr "Přeskočení rozpadlých trvalo %i kol "
msgid ""
"\n"
"Packages skipped because of dependency problems:"
-msgstr "\n
Balíčky přeskočené kvůli problémům se závislostmi:"
+msgstr ""
+"\n"
+"
Balíčky přeskočené kvůli problémům se závislostmi:"
#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s z %s"
-#: ../yum/__init__.py:1076
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
-"Varování: Během transakce došlo k chybě skripletu nebo jiné nefatální chybě."
+"Varování: Během transakce došlo k chybě skriptletu nebo jiné nefatální chybě."
-#: ../yum/__init__.py:1093
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Selhalo odstranění transakčního souboru %s."
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1122
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
-msgstr "%s mělo být nainstalováno ale neni!"
+msgstr "%s 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:1161
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
-msgstr "%s mělo být odstraněno ale není!"
+msgstr "%s mělo být odstraněno, ale není!"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1281
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
-msgstr "Nedá se zkontrolovat zda je PID %s aktivní."
+msgstr "Nedá se zkontrolovat, zda je PID %s aktivní."
#. Another copy seems to be running.
-#: ../yum/__init__.py:1285
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Existující zámek %s: jiná kopie běží s pid %s."
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1320
+#: ../yum/__init__.py:1328
#, python-format
msgid "Could not create lock at %s: %s "
msgstr "Nelze vytvořit zámek na %s: %s "
-#: ../yum/__init__.py:1365
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Balíček se neshoduje se zamýšleným stahováním"
-#: ../yum/__init__.py:1380
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Nelze zkontrolovat kontrolní součet"
-#: ../yum/__init__.py:1383
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Balíček neodpovídá kontrolnímu součtu"
-#: ../yum/__init__.py:1425
+#: ../yum/__init__.py:1433
#, 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"
-#: ../yum/__init__.py:1428 ../yum/__init__.py:1457
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "používá se lokální kopie %s"
-#: ../yum/__init__.py:1469
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -2029,252 +2040,253 @@ msgstr ""
" * volno %s\n"
" * potřeba %s"
-#: ../yum/__init__.py:1518
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
-msgstr "Hlavička není komplet."
+msgstr "Hlavička není kompletní."
-#: ../yum/__init__.py:1555
+#: ../yum/__init__.py:1563
#, python-format
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ím skladišti, ale je povoleno používat pouze "
+"skladiště. Nemohu stáhnout %s"
-#: ../yum/__init__.py:1610
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Veřejný klíč %s není nainstalován"
-#: ../yum/__init__.py:1614
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problém s otevřením balíčku %s"
-#: ../yum/__init__.py:1622
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Veřejný klíč %s není důvěryhodný"
-#: ../yum/__init__.py:1626
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Balíček %s není podepsán"
-#: ../yum/__init__.py:1664
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Nemohu odstranit %s"
-#: ../yum/__init__.py:1668
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
-msgstr "%s odstraňen"
+msgstr "%s odstraněn"
-#: ../yum/__init__.py:1704
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Nemohu odstranit %s soubor %s"
-#: ../yum/__init__.py:1708
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s soubor %s odstraněn"
-#: ../yum/__init__.py:1710
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s soubor odstraněn"
-#: ../yum/__init__.py:1779
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
-msgstr "Více než jedna identická shoda v pytly pro %s"
+msgstr "Více než jedna identická shoda v pytli pro %s"
-#: ../yum/__init__.py:1785
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Nic se neshoduje s %s.%s %s:%s-%s z aktualizace"
-#: ../yum/__init__.py:2018
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-"searchPackages() bude odstraněno v příští verzi Yumu. "
-"Používejte místo ní searchGenerator(). \n"
+"searchPackages() bude odstraněn v příští verzi Yumu. "
+"Používejte místo něj searchGenerator(). \n"
-#: ../yum/__init__.py:2057
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Prohledává se %d balíčků"
-#: ../yum/__init__.py:2061
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "prohledává se balíček %s"
-#: ../yum/__init__.py:2073
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "hledá se v souborových položkách"
-#: ../yum/__init__.py:2080
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "hledá se v položkách poskytovatelů"
-#: ../yum/__init__.py:2113
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Poskytovatel-shoda: %s"
-#: ../yum/__init__.py:2162
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Pro nastavený repozitář nejsou žádná dostupná skupinová data"
-#: ../yum/__init__.py:2193 ../yum/__init__.py:2212 ../yum/__init__.py:2243
-#: ../yum/__init__.py:2249 ../yum/__init__.py:2328 ../yum/__init__.py:2332
-#: ../yum/__init__.py:2647
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Neexistuje skupina pojmenovaná %s"
-#: ../yum/__init__.py:2224 ../yum/__init__.py:2345
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "balíček %s nebyl označen ve skupině %s"
-#: ../yum/__init__.py:2271
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Přidává se balíček %s pro skupinu %s"
-#: ../yum/__init__.py:2275
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
-msgstr "Neexistuje žádný balíček pojmenovaný %s dostupný k instalaci"
+msgstr "Žádný balíček pojmenovaný %s není dostupný pro instalaci"
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
-msgstr "Uspořádaný seznam balíčků %s nenalezen v pytly balíčků"
+msgstr "Uspořádaný seznam balíčků %s nenalezen v pytli balíčků"
-#: ../yum/__init__.py:2391, python-format
+#: ../yum/__init__.py:2399
+#, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr "Uspořádaný seznam balíčků %s nenalezen v rpmdb"
-#: ../yum/__init__.py:2447 ../yum/__init__.py:2497
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
-msgstr "Chybý příznak verze"
+msgstr "Chybný příznak verze"
-#: ../yum/__init__.py:2467 ../yum/__init__.py:2472
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Nebyl nalezen balíček pro %s"
-#: ../yum/__init__.py:2688
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Objekt balíčku nebyl instancí balíčkového objektu"
-#: ../yum/__init__.py:2692
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Nebylo určeno nic k instalaci"
-#: ../yum/__init__.py:2708 ../yum/__init__.py:3472
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Hledá se virtuální poskytovatel nebo soubor poskytující %s"
-#: ../yum/__init__.py:2714 ../yum/__init__.py:3021 ../yum/__init__.py:3188
-#: ../yum/__init__.py:3478
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Nenalezena shoda pro argument: %s"
-#: ../yum/__init__.py:2790
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
-msgstr "Balíček %s nainstalován ale není dostupný"
+msgstr "Balíček %s je nainstalován, ale není dostupný"
-#: ../yum/__init__.py:2793
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Žádný balíček/ky dostupný pro instalaci"
-#: ../yum/__init__.py:2805
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
-msgstr "Balíček: %s - již je v transakci"
+msgstr "Balíček: %s - již je v transakční sadě"
-#: ../yum/__init__.py:2831
+#: ../yum/__init__.py:2839
#, 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"
-#: ../yum/__init__.py:2834
+#: ../yum/__init__.py:2842
#, 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"
-#: ../yum/__init__.py:2842
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
-msgstr "Balíček %s již nainstalován a v poslední verzi"
+msgstr "Balíček %s je již nainstalován a v poslední verzi"
-#: ../yum/__init__.py:2856
+#: ../yum/__init__.py:2864
#, 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."
#. update everything (the easy case)
-#: ../yum/__init__.py:2950
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Aktualizuje se vše"
-#: ../yum/__init__.py:2971 ../yum/__init__.py:3086 ../yum/__init__.py:3115
-#: ../yum/__init__.py:3142
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Neaktualizuje se balíček, který je již zastaralý: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3006 ../yum/__init__.py:3185
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3077
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Balíček je již zastaralý: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3110
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Neaktualizuje se balíček, který je zastaralý: %s"
-#: ../yum/__init__.py:3119 ../yum/__init__.py:3146
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Neaktualizuje se balíček, který jej již aktuální: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3201
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Nenalezen žádný shodný balíček pro odstranění"
-#: ../yum/__init__.py:3234 ../yum/__init__.py:3338 ../yum/__init__.py:3427
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Nelze otevřít soubor: %s. Přeskakuje se."
-#: ../yum/__init__.py:3237 ../yum/__init__.py:3341 ../yum/__init__.py:3430
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Zkoumá se %s: %s"
-#: ../yum/__init__.py:3245 ../yum/__init__.py:3344 ../yum/__init__.py:3433
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
-msgstr "Nelze přídat balíček %s do transakce. Nekompatibilní architektura: %s"
+msgstr "Nelze přidat balíček %s do transakce. Nekompatibilní architektura: %s"
-#: ../yum/__init__.py:3253
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2283,97 +2295,98 @@ msgstr ""
"Balíček %s není nainstalován, nelze jej aktualizovat. Spusťte místo toho yum "
"install a nainstalujte jej."
-#: ../yum/__init__.py:3288 ../yum/__init__.py:3355 ../yum/__init__.py:3444
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Vynechává se %s"
-#: ../yum/__init__.py:3293
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Označuje se %s k instalaci"
-#: ../yum/__init__.py:3299
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Označuje se %s jako aktualizace %s"
-#: ../yum/__init__.py:3306
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
-msgstr "%s: není aktualizací instalovaného balíčku"
+msgstr "%s: není aktualizací instalovaného balíčku."
-#: ../yum/__init__.py:3374
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "Problém při reinstalaci: žádný shodný balíček k odstranění"
-#: ../yum/__init__.py:3387 ../yum/__init__.py:3506
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Balíček %s má dovoleno vícero instalací, přeskakuje se"
-#: ../yum/__init__.py:3408
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr "Problém při reinstalaci: žádný shodný balíček %s k instalaci"
-#: ../yum/__init__.py:3498
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Žádný balíček/ky dostupné ke snížení verze"
-#: ../yum/__init__.py:3542
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Neexistuje shoda pro dostupný balíček: %s"
-#: ../yum/__init__.py:3548
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Pouze aktualizace dostupná pro balíček: %s"
-#: ../yum/__init__.py:3616 ../yum/__init__.py:3653, python-format
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, python-format
msgid "Failed to downgrade: %s"
msgstr "Nepodařilo se snížit verzi: %s"
-#: ../yum/__init__.py:3685
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Získává se GPG klíč pro %s"
-#: ../yum/__init__.py:3705
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
-msgstr "Získání GPG klíč selhalo: "
+msgstr "Získání GPG klíče selhalo: "
-#: ../yum/__init__.py:3716
+#: ../yum/__init__.py:3735
#, 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"
-#: ../yum/__init__.py:3748
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG klíč %s (0x%s) je již nainstalován"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3753 ../yum/__init__.py:3815
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importuje se GPG klíč 0x%s \"%s\" z %s"
-#: ../yum/__init__.py:3770
+#: ../yum/__init__.py:3789
msgid "Not installing key"
-msgstr "Neinstaluji klíč"
+msgstr "Neinstaluje se klíč"
-#: ../yum/__init__.py:3776
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Import klíče selhal (kód %d)"
-#: ../yum/__init__.py:3777 ../yum/__init__.py:3836
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Import klíče proběhl úspěšně"
-#: ../yum/__init__.py:3782 ../yum/__init__.py:3841
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2384,45 +2397,45 @@ msgstr ""
"tento balíček.\n"
"Zkontrolujte, že URL klíče jsou pro repozitář správně nastavena."
-#: ../yum/__init__.py:3791
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Import klíče/ů nepomohl, špatný klíč(e)?"
-#: ../yum/__init__.py:3810
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG klíč %s (0x%s) je již naimportován"
-#: ../yum/__init__.py:3830
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Neinstaluji klíč pro repozitář %s"
-#: ../yum/__init__.py:3835
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Import klíče selhal"
-#: ../yum/__init__.py:3957
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Nemohu nalézt vhodné zrcadlo"
-#: ../yum/__init__.py:3959
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Při stahování balíčků došlo k chybě."
-#: ../yum/__init__.py:4009
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
-msgstr "Prosím ohlašte tuto chybu na %s"
+msgstr "Oznamte prosím tuto chybu na %s"
-#: ../yum/__init__.py:4033
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Chyby testu transakce: "
#. Mostly copied from YumOutput._outKeyValFill()
#: ../yum/plugins.py:202
msgid "Loaded plugins: "
-msgstr "Zavedeny zásuvné moduly:"
+msgstr "Zavedeny zásuvné moduly: "
#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
@@ -2453,7 +2466,7 @@ msgstr "Modul \"%s\" požaduje API %s. Podporované API je %s."
#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
-msgstr "Zavádí se zásvuný modul \"%s\""
+msgstr "Zavádí se zásuvný modul \"%s\""
#: ../yum/plugins.py:316
#, python-format
@@ -2493,7 +2506,7 @@ 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 jíž používána?"
+msgstr "Nelze otevřít databázi RPM pro čtení. Možná je již používána?"
#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
diff --git a/po/da.po b/po/da.po
index 2a31862..68a9be5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum 3.2.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-07 20:03+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-08-08 02:37+0200\n"
"Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:939 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Opdaterer"
@@ -25,7 +25,7 @@ msgstr "Opdaterer"
msgid "Erasing"
msgstr "Sletter"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:938
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installerer"
@@ -34,15 +34,16 @@ msgstr "Installerer"
msgid "Obsoleted"
msgstr "Overflødiggjort"
-#: ../callback.py:54 ../output.py:1060
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Opdateret"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Slettet"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1058
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Installeret"
@@ -64,7 +65,7 @@ msgstr "Error: ugyldig uddatastatus: %s for %s"
msgid "Erased: %s"
msgstr "Slettet: %s"
-#: ../callback.py:217 ../output.py:940
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Sletter"
@@ -72,60 +73,60 @@ msgstr "Sletter"
msgid "Cleanup"
msgstr "Oprydning af"
-#: ../cli.py:107
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Kommandoen \"%s\" er allerede defineret"
-#: ../cli.py:119
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Indstiller pakkearkiver"
-#: ../cli.py:130
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Læser pakkearkiv for metadata fra lokale filer"
-#: ../cli.py:193 ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Konfigurationsfejl: %s"
-#: ../cli.py:196 ../cli.py:1253 ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Fejl i indstilling: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Installeret: %s-%s på %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Bygget : %s på %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Indsendt: %s på %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Du skal angive en kommando"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Behov for diskplads:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Der er brug for mindst %dmb på %s-filsystemet.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -133,64 +134,64 @@ msgstr ""
"Fejlopsummering\n"
"---------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Forsøger at udføre overførslen, men der intet at udføre. Afslutter."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Afslutter efter brugerens ønske"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Henter pakker:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Fejl ved hentning af pakker:\n"
-#: ../cli.py:420 ../yum/__init__.py:3820
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Kører rpm_check_debug"
-#: ../cli.py:429 ../yum/__init__.py:3829
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "FEJL Du skal opdatere RPM for at håndtere:"
-#: ../cli.py:431 ../yum/__init__.py:3832
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "FEJL i rpm_check_dedug vs afhængighedsløsning:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "RPM skal opdateres"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Rapportér venligst denne fejl i %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Kører overførselstest"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Afsluttede overførselstest"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Fejl i overførselskontrol:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Overførselstest afsluttet uden fejl"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Kører overførsel"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -198,79 +199,79 @@ msgstr ""
"Afviser automatisk importering af nøgler ved baggrundskørsel.\n"
"Brug \"-y\" til at overskrive."
-#: ../cli.py:540 ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Du mente måske: "
-#: ../cli.py:557 ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Pakke(r) %s%s%s tilgængelig(e), men ikke installeret."
-#: ../cli.py:571 ../cli.py:602 ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Pakken %s%s%s er ikke tilgængelig."
-#: ../cli.py:607 ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Pakke(r) til installation"
-#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741
-#: ../yumcommands.py:157
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Intet at udføre"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pakker markeret til opdatering"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Ingen pakker markeret til opdatering"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pakker markeret til sletning"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Ingen pakker markeret til sletning"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Pakke(r) til nedgradering"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (fra %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Installeret pakke %s%s%s%s er ikke tilgængelig."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Pakke(r) til geninstallation"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Ingen pakker angivet"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Advarsel: Ingen match blev fundet for: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Ingen match fundet"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -279,108 +280,108 @@ msgstr ""
"Advarsel: 3.0.x-versioner af yum vil matche fejlagtigt mod filnavne.\n"
" Du kan bruge \"%s*/%s%s\" og/eller \"%s*bin/%s%s\" for at få den opførsel"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Ingen pakke fundet for %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Oprydning af alt"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Oprydning af headerfiler"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Oprydning af pakker"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Oprydning af xml-metadata"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Oprydning af mellemlager til database"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Oprydning af udløbet mellemlager til metadata"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Oprydning af udvidelsesmoduler"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Installerede grupper:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Tilgængelige grupper:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Afsluttet"
-#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2555
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Advarsel: Gruppen %s findes ikke."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Ingen pakke i nogen de efterspurgte grupper, er tilgængelige til "
"installation eller opdatering"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pakke(r) til installation"
-#: ../cli.py:1012 ../yum/__init__.py:2567
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Gruppen %s findes ikke"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Ingen pakker at slette fra grupper"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pakke(r) til sletning"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Pakken %s er allerede installeret, springer over"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Ser bort fra ikke-kompatibel pakke %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Ingen andre %s er installeret, tilføjer til liste til mulig installation"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Indstillinger til udvidelsesmodul"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Kommandoliniefejl: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -391,257 +392,257 @@ msgstr ""
"\n"
"%s: %s indstilling kræver et argument"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color tager en af: auto, altid, aldrig"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "vis denne hjælpemeddelse og afslut"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "vær fejltolerant"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "kør kun fra mellemlager, ingen opdatering af mellemlageret"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "placering af konfigurationsfil"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "maksimal ventetid på kommando"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "debug-visningsniveau"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "vis gengangere, i pakkearkiver, i list/search-kommandoer"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "fejlvisningsniveau"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "stille operation"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "uddybende operation"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "svar ja til alle spørgsmål"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "vis Yum-version og afslut"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "sæt installationsroden"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "aktivér en eller flere pakkearkiver (wildcards er tilladt)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "deaktivér en eller flere pakkearkiver (wildcards er tilladt)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "ekskludér pakke(r) med navn eller klump"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "deaktivér ekskludering fra main, for et pakkearkiv eller for alt"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "aktivér overflødiggørelse under behandling af opdateringer"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "deaktivér Yum-udvidelsesmoduler"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "deaktivér kontrol af gpg-signaturer"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "deaktivér udvidelsesmoduler ved navn"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "aktivér udvidelsesmoduler ved navn"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "spring pakker med afhængighedsproblemer over"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "kontrollér om farve er brugt"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jan"
msgstr "Jan"
-#: ../output.py:303
+#: ../output.py:305
msgid "Feb"
msgstr "Feb"
-#: ../output.py:303
+#: ../output.py:305
msgid "Mar"
msgstr "Mar"
-#: ../output.py:303
+#: ../output.py:305
msgid "Apr"
msgstr "Apr"
-#: ../output.py:303
+#: ../output.py:305
msgid "May"
msgstr "Maj"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jun"
msgstr "Jun"
-#: ../output.py:304
+#: ../output.py:306
msgid "Jul"
msgstr "Jul"
-#: ../output.py:304
+#: ../output.py:306
msgid "Aug"
msgstr "Aug"
-#: ../output.py:304
+#: ../output.py:306
msgid "Sep"
msgstr "Sep"
-#: ../output.py:304
+#: ../output.py:306
msgid "Oct"
msgstr "Okt"
-#: ../output.py:304
+#: ../output.py:306
msgid "Nov"
msgstr "Nov"
-#: ../output.py:304
+#: ../output.py:306
msgid "Dec"
msgstr "Dec"
-#: ../output.py:314
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Prøver et andet filspejl."
-#: ../output.py:536
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Navn : %s%s%s"
-#: ../output.py:537
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Arkitektur : %s"
-#: ../output.py:539
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Epoch : %s"
-#: ../output.py:540
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Version : %s"
-#: ../output.py:541
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Udgivelse : %s"
-#: ../output.py:542
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Størrelse : %s"
-#: ../output.py:543
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Kilde : %s"
-#: ../output.py:545
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Fra kilde : %s"
-#: ../output.py:547
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Indsender : %s"
-#: ../output.py:548
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Indsendingstid : %s"
-#: ../output.py:549
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Byggetid : %s"
-#: ../output.py:551
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Installationstid: %s"
-#: ../output.py:552
+#: ../output.py:554
msgid "Summary : "
msgstr "Resumé : "
-#: ../output.py:554
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:555
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Licens : %s"
-#: ../output.py:556
+#: ../output.py:558
msgid "Description: "
msgstr "Beskrivelse: "
-#: ../output.py:624
+#: ../output.py:626
msgid "y"
msgstr "j"
-#: ../output.py:624
+#: ../output.py:626
msgid "yes"
msgstr "ja"
-#: ../output.py:625
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:625
+#: ../output.py:627
msgid "no"
msgstr "nej"
-#: ../output.py:629
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "Er dette o.k. [j/N]: "
-#: ../output.py:720
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -650,141 +651,141 @@ msgstr ""
"\n"
"Gruppe: %s"
-#: ../output.py:724
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " Gruppeid: %s"
-#: ../output.py:729
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Beskrivelse: %s"
-#: ../output.py:731
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Tvungne pakker:"
-#: ../output.py:732
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Standardpakker:"
-#: ../output.py:733
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " Valgfrie pakker:"
-#: ../output.py:734
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Afhængige pakker:"
-#: ../output.py:754
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "pakke: %s"
-#: ../output.py:756
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Ingen afhængigheder for denne pakke"
-#: ../output.py:761
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " afhængighed: %s"
-#: ../output.py:763
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Ufuldendt afhængighed"
-#: ../output.py:835
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Kilde : %s"
-#: ../output.py:836
+#: ../output.py:838
msgid "Matched from:"
msgstr "Matchet af:"
-#: ../output.py:845
+#: ../output.py:847
msgid "Description : "
msgstr "Beskrivelse : "
-#: ../output.py:848
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:851
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Licens : %s"
-#: ../output.py:854
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Filnavn : %s"
-#: ../output.py:858
+#: ../output.py:860
msgid "Other : "
msgstr "Andre : "
-#: ../output.py:891
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "Der opstod en fejl i beregning af den totale hentningsstørrelse"
-#: ../output.py:896
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Total størrelse: %s"
-#: ../output.py:899
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Total hentningsstørrelse: %s"
-#: ../output.py:941
+#: ../output.py:942
msgid "Reinstalling"
msgstr "Geninstallerer"
-#: ../output.py:942
+#: ../output.py:943
msgid "Downgrading"
msgstr "Nedgraderer"
-#: ../output.py:943
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Installerer til afhængigheder"
-#: ../output.py:944
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Opdaterer til afhængigheder"
-#: ../output.py:945
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Sletter til afhængigheder"
-#: ../output.py:952 ../output.py:1062
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Sprunget over (afhængighedsproblemer)"
-#: ../output.py:973
+#: ../output.py:976
msgid "Package"
msgstr "Pakke"
-#: ../output.py:973
+#: ../output.py:976
msgid "Arch"
msgstr "Arkitektur"
-#: ../output.py:974
+#: ../output.py:977
msgid "Version"
msgstr "Version"
-#: ../output.py:974
+#: ../output.py:977
msgid "Repository"
msgstr "Pakkearkiv"
-#: ../output.py:975
+#: ../output.py:978
msgid "Size"
msgstr "Størrelse"
-#: ../output.py:987
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -793,7 +794,7 @@ msgstr ""
" erstatter %s%s%s.%s %s\n"
"\n"
-#: ../output.py:996
+#: ../output.py:999
#, python-format
msgid ""
"\n"
@@ -804,7 +805,7 @@ msgstr ""
"Overførselsopsummering\n"
"%s\n"
-#: ../output.py:1003
+#: ../output.py:1006
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
@@ -813,7 +814,7 @@ msgstr ""
"Installér %5.5s pakke(r)\n"
"Opgradér %5.5s pakke(r)\n"
-#: ../output.py:1012
+#: ../output.py:1015
#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
@@ -824,32 +825,32 @@ msgstr ""
"Geninstallér %5.5s pakke(r)\n"
"Nedgradér %5.5s pakke(r)\n"
-#: ../output.py:1056
+#: ../output.py:1059
msgid "Removed"
msgstr "Slettet"
-#: ../output.py:1057
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Afhængighed slettet"
-#: ../output.py:1059
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Afhængighed installeret"
-#: ../output.py:1061
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Afhængighed opdateret"
-#: ../output.py:1063
+#: ../output.py:1066
msgid "Replaced"
msgstr "Erstattet"
-#: ../output.py:1064
+#: ../output.py:1067
msgid "Failed"
msgstr "Fejlede"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1130
+#: ../output.py:1133
msgid "two"
msgstr "to"
@@ -857,7 +858,7 @@ msgstr "to"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1141
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
@@ -870,76 +871,254 @@ msgstr ""
"sekunder\n"
"for at afslutte.\n"
-#: ../output.py:1152
+#: ../output.py:1155
msgid "user interrupt"
msgstr "afsluttet af bruger"
-#: ../output.py:1168
+#: ../output.py:1173
msgid "Total"
msgstr "Ialt"
-#: ../output.py:1183
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Kører overførsel"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Fejl i overførselskontrol:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Andre : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#, fuzzy
+msgid "Return-Code :"
+msgstr "Kildeid : "
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Overflødiggjort"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Fejlede"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Fejl i overførselskontrol:\n"
+
+#: ../output.py:1405
+#, fuzzy
+msgid "Downgraded"
+msgstr "Nedgraderer"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Ingen pakker angivet"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Fejl: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "installeret"
-#: ../output.py:1184
+#: ../output.py:1525
msgid "updated"
msgstr "opdateret"
-#: ../output.py:1185
+#: ../output.py:1526
msgid "obsoleted"
msgstr "overflødiggjort"
-#: ../output.py:1186
+#: ../output.py:1527
msgid "erased"
msgstr "slettet"
-#: ../output.py:1190
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Pakke %s.%s %s:%s-%s sat til at blive %s"
-#: ../output.py:1197
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Kører overførselskontrol"
-#: ../output.py:1202
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Genstarter afhængighedssøgning med nye ændringer."
-#: ../output.py:1207
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Afsluttede afhængighedssøgningen"
-#: ../output.py:1212 ../output.py:1217
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Behandler afhængighed: %s for pakken: %s"
-#: ../output.py:1221
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Ikke fundet afhængighed: %s"
-#: ../output.py:1227 ../output.py:1232
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Behandler konflikt: %s konflikter med %s"
-#: ../output.py:1236
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Udfylder overførselssættet med valgte pakker. Vent venligst."
-#: ../output.py:1240
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Henter headerfil for %s til at indsætte i overførselssættet."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Afslutter efter brugerens ønske"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Afslutter på ødelagt tunnel"
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Afsluttet!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Du skal være root for at udføre denne kommando."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -971,313 +1150,348 @@ msgstr ""
"\n"
"For mere information, kan du kontakte din distribution eller pakkeudbyder.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Fejl: En liste med pakker behøves af %s"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Fejl: Behøver noget at matche med"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Fejl: Behøver en gruppe eller liste af grupper"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Fejl: clean behøver en indstilling: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Fejl: ugyldigt clean-argument: %r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Ingen argumenter til skal"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Filnavn tilpasset skal: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr "Filen %s givet som argument til skal findes ikke."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr "Fejl: mere end en fil angivet som argument til skal."
-#: ../yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAKKE..."
-#: ../yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Installerer en eller flere pakker på systemet"
-#: ../yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Opsætning af installationsprocessen"
-#: ../yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAKKE...]"
-#: ../yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Opdaterer en eller flere pakker på systemet"
-#: ../yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Opsætning af opdateringsprocessen"
-#: ../yumcommands.py:244
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Vis detaljer om en pakke eller en gruppe af pakker"
-#: ../yumcommands.py:293
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Installerede pakker"
-#: ../yumcommands.py:301
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Tilgængelige pakker"
-#: ../yumcommands.py:305
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Ekstra pakker"
-#: ../yumcommands.py:309
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Opdaterede pakker"
#. This only happens in verbose mode
-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:600
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Overflødiggør pakker"
-#: ../yumcommands.py:326
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Pakker som er tilføjet for nyligt"
-#: ../yumcommands.py:333
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Ingen matchende pakker til liste"
-#: ../yumcommands.py:347
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Viser en pakke eller en gruppe af pakker"
-#: ../yumcommands.py:359
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Sletter en eller flere pakker fra dit system"
-#: ../yumcommands.py:366
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Opsætning af sletningsprocessen"
-#: ../yumcommands.py:380
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Opsætning af gruppeprocessen"
-#: ../yumcommands.py:386
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Ingen grupper, på hvilke der køres en kommando"
-#: ../yumcommands.py:399
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Vis tilgængelige pakkegrupper"
-#: ../yumcommands.py:416
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Installér alle pakkerne i en gruppe på dit system"
-#: ../yumcommands.py:438
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Sletter alle pakkerne i en gruppe fra dit system"
-#: ../yumcommands.py:465
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Vis informationer om en pakkegruppe"
-#: ../yumcommands.py:489
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Opretter mellemlager for metadata"
-#: ../yumcommands.py:495
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Opretter mellemlagerfiler til alle metadatafiler."
-#: ../yumcommands.py:496
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
"Dette kan tage et stykke tid, afhængigt af hastigheden op denne computer"
-#: ../yumcommands.py:517
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Mellemlager for metadata oprettet"
-#: ../yumcommands.py:531
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Sletter data fra cachen"
-#: ../yumcommands.py:551
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Finder pakker som leverer en given værdi"
-#: ../yumcommands.py:571
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Kontrol af tilgængelige pakkeopdateringer"
-#: ../yumcommands.py:620
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Søger efter en given streng i pakkeinformationerne"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Søger i pakkerne: "
-#: ../yumcommands.py:643
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Opdaterer pakker, tager hensyn til overflødiggjorte pakker"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Opsætning af opgraderingsprocessen"
-#: ../yumcommands.py:665
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Installer en lokal RPM-fil"
-#: ../yumcommands.py:673
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Opsætning af lokalpakkeprocessen"
-#: ../yumcommands.py:692
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Bestem hvilken pakke som leverer en bestemt afhængighed"
-#: ../yumcommands.py:695
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Søger efter afhængighed i pakkerne:"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Kør en interaktiv Yum-skal"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Opsætning af Yum-skal"
-#: ../yumcommands.py:733
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Viser en pakkes afhængigheder"
-#: ../yumcommands.py:739
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Finder afhængigheder: "
-#: ../yumcommands.py:755
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Viser de konfigurerede pakkearkiver"
-#: ../yumcommands.py:803 ../yumcommands.py:804
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "aktiveret"
-#: ../yumcommands.py:812 ../yumcommands.py:813
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "deaktiveret"
-#: ../yumcommands.py:827
-msgid "Repo-id : "
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
msgstr "Kildeid : "
-#: ../yumcommands.py:828
-msgid "Repo-name : "
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
msgstr "Kildenavn : "
-#: ../yumcommands.py:829
-msgid "Repo-status : "
+#: ../yumcommands.py:836
+#, fuzzy
+msgid "Repo-status : "
msgstr "Kildestatus : "
-#: ../yumcommands.py:831
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Kilderevision: "
-#: ../yumcommands.py:835
-msgid "Repo-tags : "
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
msgstr "Kildeflag : "
-#: ../yumcommands.py:841
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Kildedistroflag: "
-#: ../yumcommands.py:846
-msgid "Repo-updated: "
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
msgstr "Kildeopdateret: "
-#: ../yumcommands.py:848
-msgid "Repo-pkgs : "
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
msgstr "Kildepakker : "
-#: ../yumcommands.py:849
-msgid "Repo-size : "
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
msgstr "Kildestørrelse : "
-#: ../yumcommands.py:856
-msgid "Repo-baseurl: "
+#: ../yumcommands.py:863
+#, fuzzy
+msgid "Repo-baseurl : "
msgstr "Kildegrundurl: "
-#: ../yumcommands.py:864
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Kildemetahenvisning: "
-#: ../yumcommands.py:868
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Opdateret : "
-#: ../yumcommands.py:871
-msgid "Repo-mirrors: "
+#: ../yumcommands.py:878
+#, fuzzy
+msgid "Repo-mirrors : "
msgstr "Kildespejle: "
-#: ../yumcommands.py:875
-msgid "Repo-exclude: "
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, fuzzy, python-format
+msgid "Instant (last: %s)"
+msgstr "Installationstid: %s"
+
+#: ../yumcommands.py:893
+#, fuzzy, python-format
+msgid "%s second(s) (last: %s)"
+msgstr "%s konflikter: %s"
+
+#: ../yumcommands.py:895
+#, fuzzy
+msgid "Repo-expire : "
+msgstr "Kildestørrelse : "
+
+#: ../yumcommands.py:898
+#, fuzzy
+msgid "Repo-exclude : "
msgstr "Kildeekskluder: "
-#: ../yumcommands.py:879
-msgid "Repo-include: "
+#: ../yumcommands.py:902
+#, fuzzy
+msgid "Repo-include : "
msgstr "Kildeinkluder: "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:889 ../yumcommands.py:915
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "kildeid"
-#: ../yumcommands.py:903 ../yumcommands.py:904 ../yumcommands.py:918
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "status"
-#: ../yumcommands.py:916
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "kildenavn"
-#: ../yumcommands.py:942
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Viser hjælp om brugen af en kommando"
-#: ../yumcommands.py:976
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Ingen tilgængelig hjælp til %s"
-#: ../yumcommands.py:981
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1287,7 +1501,7 @@ msgstr ""
"\n"
"aliaser: "
-#: ../yumcommands.py:983
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1297,127 +1511,136 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:1011
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Opsætning af geninstallationsprocessen"
-#: ../yumcommands.py:1019
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "geninstallér en pakke"
-#: ../yumcommands.py:1037
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Opsætning af nedgraderingsprocessen"
-#: ../yumcommands.py:1044
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "nedgradér en pakke"
-#: ../yumcommands.py:1058
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr "Vis en version for maskinen og/eller tilgængelige pakkearkiver."
-#: ../yumcommands.py:1085
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " Gruppeid: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Pakke"
+
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "Installeret:"
-#: ../yumcommands.py:1094
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Installeret:"
+
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "Tilgængelige:"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Tilgængelige:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
msgstr ""
-"\n"
-"\n"
-"Afslutter efter brugerens ønske"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
msgstr ""
-"\n"
-"\n"
-"Afslutter på ødelagt tunnel"
-#: ../yummain.py:126
+#: ../yummain.py:128
msgid "Running"
msgstr "Kører"
-#: ../yummain.py:127
+#: ../yummain.py:129
msgid "Sleeping"
msgstr "Sover"
-#: ../yummain.py:128
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "Kan ikke forstyres"
-#: ../yummain.py:129
+#: ../yummain.py:131
msgid "Zombie"
msgstr "Zombie"
-#: ../yummain.py:130
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr "Fundet/stoppet"
-#: ../yummain.py:131
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../yummain.py:135
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " Det andet program er: PackageKit"
-#: ../yummain.py:137
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " Det andet program er: %s"
-#: ../yummain.py:140
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Hukommelse : %5s RSS (%5sB VSZ)"
-#: ../yummain.py:144
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " Startede: %s - %s siden"
-#: ../yummain.py:146
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " Status : %s, pid: %d"
-#: ../yummain.py:171
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr "Yum er låst af et andet program, venter på at den afslutter..."
-#: ../yummain.py:199 ../yummain.py:238
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Fejl: %s"
-#: ../yummain.py:209 ../yummain.py:251
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Ukendt(e) fejl: Returkode: %d:"
#. Depsolve stage
-#: ../yummain.py:216
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "Løser afhængigheder"
-#: ../yummain.py:240
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
msgstr " Du kunne prøve at bruge --skip-broken til at arbejde udenom problemet"
-#: ../yummain.py:241
+#: ../yummain.py:243
msgid ""
" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
@@ -1427,7 +1650,7 @@ msgstr ""
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"
-#: ../yummain.py:257
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1435,11 +1658,7 @@ msgstr ""
"\n"
"Afhængigheder løst"
-#: ../yummain.py:271
-msgid "Complete!"
-msgstr "Afsluttet!"
-
-#: ../yummain.py:318
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1449,196 +1668,196 @@ msgstr ""
"\n"
"Afslutter efter brugerens ønske."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() vil blive fjernet i en fremtidig version af Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Opsætning af TransactionSets før config-klassen er sat op"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Invalid tsflag i konfigurationsfilen: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Søger i pkgSack for afhængigheden: %s"
-#: ../yum/depsolve.py:183
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Mulig match for %s fra %s"
-#: ../yum/depsolve.py:191
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Matchede %s som afhængighed for %s"
-#: ../yum/depsolve.py:232
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Medlem: %s"
-#: ../yum/depsolve.py:246 ../yum/depsolve.py:756
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s konverteret til installation"
-#: ../yum/depsolve.py:253
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Tilføjer pakke %s i mode %s"
-#: ../yum/depsolve.py:263
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Sletter Pakke %s"
-#: ../yum/depsolve.py:285
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s behøver: %s"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Afhængighed fundet tidligere, snyder"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Afhængighed er ikke et pakkenavn. Søger efter: %s"
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Mulig udbyder: %s"
-#: ../yum/depsolve.py:383
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Tilstand er %s for udbyder af %s: %s"
-#: ../yum/depsolve.py:387
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Tilstand for pakke som leverer %s: %s"
-#: ../yum/depsolve.py:391
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: %s pakker som behøver %s markeret til sletning"
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: Overflødiggør %s med %s for at finde afhængighed."
-#: ../yum/depsolve.py:407
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Opdaterer %s for at opfylde afhængighed."
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Kan ikke finde en opdateringsvej for afhængigheden for: %s"
-#: ../yum/depsolve.py:425
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Uløst afhængighed %s for %s"
-#: ../yum/depsolve.py:448
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Hurtigmatchede %s som afhængighed for %s"
#. is it already installed?
-#: ../yum/depsolve.py:490
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s er i udbydet pakker, men er allerede installeret, fjerner."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Mulig løsningspakke %s har en nyere udgave i ts."
-#: ../yum/depsolve.py:517
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Mulig løsningspakke %s har en nyere udgave installeret."
-#: ../yum/depsolve.py:525 ../yum/depsolve.py:571
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Manglende afhængighed: %s behøves af følgende pakke %s"
-#: ../yum/depsolve.py:538
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s er allerede i ts, springer den over"
-#: ../yum/depsolve.py:581
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Markerer %s som en opdatering for %s"
-#: ../yum/depsolve.py:589
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Markerer %s til installerer for %s"
-#: ../yum/depsolve.py:692 ../yum/depsolve.py:774
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Succes -- tom overførsel"
-#: ../yum/depsolve.py:731 ../yum/depsolve.py:746
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Genstarter løkke"
-#: ../yum/depsolve.py:762
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Afhængighedsproces afslutter"
-#: ../yum/depsolve.py:768
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s fra %s har afhængighedsproblemer"
-#: ../yum/depsolve.py:775
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Succes - afhængigheder løst"
-#: ../yum/depsolve.py:789
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Kontrollerer afhængigheder for %s"
-#: ../yum/depsolve.py:872
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "søger efter %s som afhængighed for %s"
-#: ../yum/depsolve.py:1014
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Kører compare_providers() for %s"
-#: ../yum/depsolve.py:1048 ../yum/depsolve.py:1054
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "bedre arkitektur i po %s"
-#: ../yum/depsolve.py:1140
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s overflødigør %s"
-#: ../yum/depsolve.py:1152
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1647,103 +1866,103 @@ msgstr ""
"arkitekturdistribution sammenligner %s med %s på %s\n"
" Vinder: %s"
-#: ../yum/depsolve.py:1159
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "normal kilde-RPM %s og %s"
-#: ../yum/depsolve.py:1165
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "normal præfiks af %s mellem %s og %s"
-#: ../yum/depsolve.py:1173
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Bedste orden: %s"
-#: ../yum/__init__.py:180
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:401
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Pakkearkiv %r mangler navn i konfigurationen, bruger id"
-#: ../yum/__init__.py:439
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "udvidelsesmoduler er allerede initieret"
-#: ../yum/__init__.py:446
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:457
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Læser lokal RPMDB"
-#: ../yum/__init__.py:478
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:498
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:528
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Opsætning af pakkelister"
-#: ../yum/__init__.py:573
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "kildeobjekt for kilde %s mangler en _resetSack-metode\n"
-#: ../yum/__init__.py:574
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "derfor kan dette pakkearkiv ikke blive nulstillet.\n"
-#: ../yum/__init__.py:579
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:591
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Bygger opdateringsobjekt"
-#: ../yum/__init__.py:626
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() vil forsvinde i en fremtidig version af Yum.\n"
-#: ../yum/__init__.py:651
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Henter gruppemetadata"
-#: ../yum/__init__.py:677
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Tilfører gruppefil fra pakkearkiv: %s"
-#: ../yum/__init__.py:686
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Tilføjelse af gruppefil fejlede for følgende pakkearkiv: %s - %s"
-#: ../yum/__init__.py:692
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Ingen tilgængelige grupper i noget pakkearkiv"
-#: ../yum/__init__.py:742
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Importerer yderligere information om filliste"
-#: ../yum/__init__.py:756
+#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr "Programmet %s%s%s er fundet i yum-utils-pakken."
-#: ../yum/__init__.py:764
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1751,17 +1970,17 @@ msgstr ""
"Der er uafsluttede overførsler tilbage. Du bør overveje at køre yum-complete-"
"transaction først for at afslutte dem."
-#: ../yum/__init__.py:832
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Skip-broken runde %i"
-#: ../yum/__init__.py:884
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Skip-broken tog %i runder "
-#: ../yum/__init__.py:885
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1769,71 +1988,77 @@ msgstr ""
"\n"
"Pakker sprunget over på grund af problemer med afhængigheder:"
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s fra %s"
-#: ../yum/__init__.py:1027
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Advarsel: skriptlet eller andre ikke-fatale fejl opstod under overførslen."
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Kunne ikke slette transaktionsfilen %s"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s skulle være blevet installeret, men det blev den ikke!"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1110
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s skulle være blevet fjernet, men det blev den ikke!"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1225
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Kunne ikke kontrollere om PID %s er aktiv"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1229
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Lås fundet %s: en anden kopi kører som PID %s."
-#: ../yum/__init__.py:1306
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, fuzzy, python-format
+msgid "Could not create lock at %s: %s "
+msgstr "Kunne ikke finde opdateringsmatch for %s"
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Pakken matcher ikke den planlagte nedhentning"
-#: ../yum/__init__.py:1321
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Kunne ikke udføre checksum"
-#: ../yum/__init__.py:1324
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Pakken matcher ikke checksum"
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "pakken fejlede checksum, men mellemlagring er aktiveret for %s"
-#: ../yum/__init__.py:1369 ../yum/__init__.py:1398
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "bruger lokal kopi af %s"
-#: ../yum/__init__.py:1410
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1844,11 +2069,11 @@ msgstr ""
" * fri %s\n"
" * behøvet %s"
-#: ../yum/__init__.py:1459
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Headerfil er ikke komplet."
-#: ../yum/__init__.py:1496
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1856,62 +2081,62 @@ msgstr ""
"Headerfil er ikke i lokal cache og kun-caching-tilstand er aktiveret. Kan "
"ikke hente %s"
-#: ../yum/__init__.py:1551
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Offentlig nøgle for %s er ikke installeret"
-#: ../yum/__init__.py:1555
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Kunne ikke åbne pakke %s"
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Offentlig nøgle for %s er ikke sikker"
-#: ../yum/__init__.py:1567
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Pakken %s er ikke signeret"
-#: ../yum/__init__.py:1605
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Kan ikke slette %s"
-#: ../yum/__init__.py:1609
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s slettet"
-#: ../yum/__init__.py:1645
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Kan ikke slette %s filen %s"
-#: ../yum/__init__.py:1649
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s filen %s er slettet"
-#: ../yum/__init__.py:1651
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s filer slettet"
-#: ../yum/__init__.py:1720
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Mere end et identisk match i liste for %s"
-#: ../yum/__init__.py:1726
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ingen opdateringer matcher %s.%s %s:%s-%s"
-#: ../yum/__init__.py:1959
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1919,183 +2144,181 @@ msgstr ""
"searchPackages() vil forsvinde i en fremtidig version af "
"Yum. Brug searchGenerator() istedet. \n"
-#: ../yum/__init__.py:2001
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Genemsøger %d pakker"
-#: ../yum/__init__.py:2005
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "gennemsøger pakke %s"
-#: ../yum/__init__.py:2017
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "gennemsøger filopslag"
-#: ../yum/__init__.py:2024
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "søger efter afhængigheder"
-#: ../yum/__init__.py:2057
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Leverer match: %s"
-#: ../yum/__init__.py:2106
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Ingen tilgængelige gruppedata i konfigurerede pakkearkiver"
-#: ../yum/__init__.py:2137 ../yum/__init__.py:2156 ../yum/__init__.py:2187
-#: ../yum/__init__.py:2193 ../yum/__init__.py:2272 ../yum/__init__.py:2276
-#: ../yum/__init__.py:2581
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Gruppen %s findes ikke"
-#: ../yum/__init__.py:2168 ../yum/__init__.py:2289
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "pakken %s var ikke markeret i gruppen %s"
-#: ../yum/__init__.py:2215
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Tilføjer pakken %s fra gruppen %s"
-#: ../yum/__init__.py:2219
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Pakken %s er ikke tilgængelig til installation"
-#: ../yum/__init__.py:2316
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Pakken %s kunne ikke findes i pakkeliste"
-#: ../yum/__init__.py:2330
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() vil forsvinde, brug self.rpmdb.searchPkgTuple"
-"().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Pakken %s kunne ikke findes i pakkeliste"
-#: ../yum/__init__.py:2386 ../yum/__init__.py:2431
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Ugyldig versionsflag"
-#: ../yum/__init__.py:2401 ../yum/__init__.py:2406
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Ingen pakke fundet for %s"
-#: ../yum/__init__.py:2614
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Pakkeobjektet er ikke en pakkeobjektinstans"
-#: ../yum/__init__.py:2618
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Der er intet angivet til installation"
-#: ../yum/__init__.py:2634 ../yum/__init__.py:3377
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Kontrollerer for virtueludbyder eller filudbyder for %s"
-#: ../yum/__init__.py:2640 ../yum/__init__.py:2938 ../yum/__init__.py:3105
-#: ../yum/__init__.py:3383
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Ingen match for argument: %s"
-#: ../yum/__init__.py:2716
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Pakken %s installeret og ikke tilgængelig"
-#: ../yum/__init__.py:2719
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Ingen pakke(r) er tilgængelig(e) til installation"
-#: ../yum/__init__.py:2731
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Pakken: %s - allerede i overførselssættet"
-#: ../yum/__init__.py:2757
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "Pakke %s er overflødiggjort af %s, som allerede er installeret"
-#: ../yum/__init__.py:2760
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "Pakke %s er overflødiggjort af %s, prøver at installere %s istedet"
-#: ../yum/__init__.py:2768
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Pakke %s er allerede installeret i den nyeste version"
-#: ../yum/__init__.py:2782
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "Pakken som matcher %s er allerede installeret. Søger efter opdatering."
#. update everything (the easy case)
-#: ../yum/__init__.py:2871
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Opdaterer alt"
-#: ../yum/__init__.py:2892 ../yum/__init__.py:3003 ../yum/__init__.py:3032
-#: ../yum/__init__.py:3059
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
"Ingen opdatering af pakke som allerede er overflødiggjort: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2927 ../yum/__init__.py:3102
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2994
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Pakke er allerede overflødiggjort: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3027
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Opdaterer ikke pakke som er blevet overflødiggjort: %s"
-#: ../yum/__init__.py:3036 ../yum/__init__.py:3063
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr ""
"Ingen opdatering af pakke som allerede er overflødiggjort: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3118
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Ingen pakker fundet til sletning"
-#: ../yum/__init__.py:3152 ../yum/__init__.py:3243 ../yum/__init__.py:3332
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Kan ikke åbne fil: %s. Springer over."
-#: ../yum/__init__.py:3155 ../yum/__init__.py:3246 ../yum/__init__.py:3335
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Undersøger %s: %s"
-#: ../yum/__init__.py:3163 ../yum/__init__.py:3249 ../yum/__init__.py:3338
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Kan ikke tilføje pakke %s til overførsel. Ikke en kompatibel arkitektur: %s"
-#: ../yum/__init__.py:3171
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2104,93 +2327,98 @@ msgstr ""
"Pakken %s er ikke installeret, så den kan ikke opdateres. Kør yum install "
"for at installere den istedet."
-#: ../yum/__init__.py:3206 ../yum/__init__.py:3260 ../yum/__init__.py:3349
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Ekskluderer %s"
-#: ../yum/__init__.py:3211
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Markerer %s til installation"
-#: ../yum/__init__.py:3217
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Markerer %s som en opdatering til %s"
-#: ../yum/__init__.py:3224
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s kan ikke opdatere installeret pakke."
-#: ../yum/__init__.py:3279
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "Problem med geninstallation, ingen pakke fundet til at blive slettet"
-#: ../yum/__init__.py:3292 ../yum/__init__.py:3410
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Pakke %s er tilladt at have flere installationer, springer over"
-#: ../yum/__init__.py:3313
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr "Problem med geninstallation: ingen pakke %s fundet til at installere"
-#: ../yum/__init__.py:3402
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Ingen pakke(r) er tilgængelig(e) til nedgradering"
-#: ../yum/__init__.py:3446
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Ingen match for tilgængelig pakke: %s"
-#: ../yum/__init__.py:3452
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Opgradér kun tilgængelig på pakke: %s"
-#: ../yum/__init__.py:3511
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Pakke(r) til nedgradering"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Henter GPG-nøgle fra %s"
-#: ../yum/__init__.py:3531
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Hentning af GPG-nøglen mislykkedes: "
-#: ../yum/__init__.py:3542
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Tolkning af GPG-nøgle mislykkedes: nøgle har ikke nogen værdi %s"
-#: ../yum/__init__.py:3574
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG-nøgle på %s (0x%s) er allerede installeret"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3579 ../yum/__init__.py:3641
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importerer GPG-nøgle 0x%s \"%s\" fra %s"
-#: ../yum/__init__.py:3596
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Installerer ikke nøgle"
-#: ../yum/__init__.py:3602
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Importering af nøgle mislykkedes (kode %d)"
-#: ../yum/__init__.py:3603 ../yum/__init__.py:3662
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Nøglen blev importet med succes"
-#: ../yum/__init__.py:3608 ../yum/__init__.py:3667
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2201,38 +2429,38 @@ msgstr ""
"er ikke korrekt for denne pakke.\n"
"Kontrollér at konfigurationen af nøgle-URL'er er korrekt for denne kilde."
-#: ../yum/__init__.py:3617
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Importering af nøgle(r) hjalp ikke, forkerte nøgle(r)?"
-#: ../yum/__init__.py:3636
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG-nøgle på %s (0x%s) er allerede importeret"
-#: ../yum/__init__.py:3656
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Installerer ikke nøgle for kilde %s"
-#: ../yum/__init__.py:3661
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Importering af nøgle mislykkedes"
-#: ../yum/__init__.py:3782
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Kunne ikke finde et passende filspejl."
-#: ../yum/__init__.py:3784
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Fejl blev fundet under hentning af pakker."
-#: ../yum/__init__.py:3834
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Rapportér venligst denne fejl på %s"
-#: ../yum/__init__.py:3858
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Fejl i testoverførslen: "
@@ -2293,7 +2521,7 @@ msgstr "Konfigurationsfilen %s er ikke fundet"
msgid "Unable to find configuration file for plugin %s"
msgstr "Kunne ikke finde konfigurationsfilen til udvidelsesmodul: %s"
-#: ../yum/plugins.py:497
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "registrering af komandoer er ikke understøttet"
@@ -2332,6 +2560,13 @@ msgid "Error opening rpm %s - error %s"
msgstr "Fejl ved åbning af RPM %s - fejl %s"
#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() vil forsvinde, brug self.rpmdb.searchPkgTuple"
+#~ "().\n"
+
+#~ msgid ""
#~ "\n"
#~ "Transaction Summary\n"
#~ "%s\n"
@@ -2373,9 +2608,6 @@ msgstr "Fejl ved åbning af RPM %s - fejl %s"
#~ msgid "Parsing package install arguments"
#~ msgstr "Behandler argumenter for pakkeinstallation"
-#~ msgid "Could not find update match for %s"
-#~ msgstr "Kunne ikke finde opdateringsmatch for %s"
-
#~ msgid ""
#~ "Failure finding best provider of %s for %s, exceeded maximum loop length"
#~ msgstr ""
@@ -2418,9 +2650,6 @@ msgstr "Fejl ved åbning af RPM %s - fejl %s"
#~ msgid "TSINFO: Updating %s to resolve conflict."
#~ msgstr "TSINFO: Opdaterer %s for at løse en konflikt."
-#~ msgid "%s conflicts: %s"
-#~ msgstr "%s konflikter: %s"
-
#~ msgid "%s conflicts with %s"
#~ msgstr "%s konflikter med %s"
diff --git a/po/de.po b/po/de.po
index 902ef1a..4a59bc8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-31 08:49+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-07-31 16:36+0100\n"
"Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
"Language-Team: German <fedora-trans-de@redhat.com>\n"
@@ -20,46 +20,33 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: German\n"
-#: ../callback.py:48
-#: ../output.py:939
-#: ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Aktualisieren"
-#: ../callback.py:49
-#: ../yum/rpmtrans.py:72
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr "Löschen"
-#: ../callback.py:50
-#: ../callback.py:51
-#: ../callback.py:53
-#: ../output.py:938
-#: ../yum/rpmtrans.py:73
-#: ../yum/rpmtrans.py:74
-#: ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installieren"
-#: ../callback.py:52
-#: ../callback.py:58
-#: ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr "Veraltet"
-#: ../callback.py:54
-#: ../output.py:1060
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Aktualisiert"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Gelöscht"
-#: ../callback.py:56
-#: ../callback.py:57
-#: ../callback.py:59
-#: ../output.py:1058
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Installiert"
@@ -82,73 +69,68 @@ msgstr "Fehler: Ungültiger Ausgabe-Zustand: %s für %s"
msgid "Erased: %s"
msgstr "Gelöscht: %s"
-#: ../callback.py:217
-#: ../output.py:940
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Entfernen"
-#: ../callback.py:219
-#: ../yum/rpmtrans.py:77
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr "Aufräumen"
-#: ../cli.py:107
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Befehl \"%s\" ist bereits definiert"
-#: ../cli.py:119
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Repositories werden eingerichtet"
-#: ../cli.py:130
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Lese Repository-Metadaten aus lokalen Dateien ein"
-#: ../cli.py:193
-#: ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Konfigurationsfehler: %s"
-#: ../cli.py:196
-#: ../cli.py:1242
-#: ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Optionenfehler: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Installiert: %s-%s am %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Gebaut : %s am %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Übermittelt: %s am %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Sie müssen irgendeinen Befehl eingeben"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Festplattenplatz-Anforderungen:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Mindestens %d MB werden auf dem Dateisystem %s benötigt.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -156,259 +138,260 @@ msgstr ""
"Fehler-Zusammenfassung\n"
"----------------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Versuche Transaktion auszuführen, aber es ist nichts zu tun. Beende."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Beende nach Befehl des Benutzers"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Lade Pakete herunter:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Fehler beim Herunterladen der Pakete:\n"
-#: ../cli.py:420
-#: ../yum/__init__.py:3817
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Führe rpm_check_debug durch"
-#: ../cli.py:423
-#: ../yum/__init__.py:3820
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "FEHLER mit rpm_check_debug gegen depsolve:"
-#: ../cli.py:427
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Bitte melden Sie diesen Fehler unter %s"
-#: ../cli.py:433
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Führe Verarbeitungstest durch"
-#: ../cli.py:449
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Verarbeitungstest beendet"
-#: ../cli.py:451
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Prüffehler bei Verarbeitung:\n"
-#: ../cli.py:458
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Verarbeitungstest erfolgreich"
-#: ../cli.py:480
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Führe Verarbeitung durch"
-#: ../cli.py:510
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-"Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt ausgeführt.\n"
+"Verweigere automatischen Import der Schlüssel, wenn unbeaufsichtigt "
+"ausgeführt.\n"
"Benutze \"-y\" zum Überschreiben."
-#: ../cli.py:529
-#: ../cli.py:563
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Meinten Sie vielleicht:"
-#: ../cli.py:546
-#: ../cli.py:554
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Paket(e) %s%s%s verfügbar, aber nicht installiert."
-#: ../cli.py:560
-#: ../cli.py:591
-#: ../cli.py:669
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Kein Paket %s%s%s verfügbar."
-#: ../cli.py:596
-#: ../cli.py:729
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Paket(e) zum Installieren"
-#: ../cli.py:597
-#: ../cli.py:675
-#: ../cli.py:708
-#: ../cli.py:730
-#: ../yumcommands.py:160
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Nichts zu tun"
-#: ../cli.py:630
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d Pakete zur Aktualisierung markiert"
-#: ../cli.py:633
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Keine Pakete für die Aktualisierung markiert"
-#: ../cli.py:647
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d Pakete für die Entfernung markiert"
-#: ../cli.py:650
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Keine Pakete für die Entfernung markiert"
-#: ../cli.py:674
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Paket(e) zum Downgrade"
-#: ../cli.py:698
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (von %s)"
-#: ../cli.py:700
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Installiertes Paket %s%s%s%s nicht verfügbar."
-#: ../cli.py:707
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Paket(e) zum Neuinstallieren"
-#: ../cli.py:720
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Keine Pakete bereitgestellt"
-#: ../cli.py:804
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Warnung: Keine Übereinstimmung gefunden für: %s"
-#: ../cli.py:807
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Keine Übereinstimmungen gefunden"
-#: ../cli.py:846
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-"Warnung: 3.0.x Versionen von yum stimmen irrtümlicherweise mit Dateinamen ab.\n"
-" Sie können \"%s*/%s%s\" und/oder \"%s*bin/%s%s\" benutzen, um dieses Verhalten zu bekommen"
+"Warnung: 3.0.x Versionen von yum stimmen irrtümlicherweise mit Dateinamen "
+"ab.\n"
+" Sie können \"%s*/%s%s\" und/oder \"%s*bin/%s%s\" benutzen, um dieses "
+"Verhalten zu bekommen"
-#: ../cli.py:862
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Kein Paket gefunden für %s"
# Räume auf, säubere...weiss jemand eine Übersetzung, welche nicht an den Staubsauger erinnert. Fabian
-#: ../cli.py:874
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Räume alles auf"
-#: ../cli.py:888
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Räume Header auf"
-#: ../cli.py:891
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Räume Pakete auf"
-#: ../cli.py:894
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Räume XML-Metadaten auf"
-#: ../cli.py:897
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Räume Datenbank-Speicher auf"
-#: ../cli.py:900
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Räume Metadaten für abgelaufene Caches auf"
-#: ../cli.py:903
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Räume Plugins auf"
-#: ../cli.py:928
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Installierte Gruppen:"
-#: ../cli.py:940
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Verfügbare Gruppen:"
-#: ../cli.py:950
+#: ../cli.py:959
msgid "Done"
msgstr "Fertig"
-#: ../cli.py:961
-#: ../cli.py:979
-#: ../cli.py:985
-#: ../yum/__init__.py:2556
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Warnung: Gruppe %s existiert nicht."
-#: ../cli.py:989
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
-msgstr "Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder Aktualisieren"
+msgstr ""
+"Keine Pakete in irgendeiner Gruppe verfügbar zum Installieren oder "
+"Aktualisieren"
-#: ../cli.py:991
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d Paket(e) zum Installieren"
-#: ../cli.py:1001
-#: ../yum/__init__.py:2568
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Es existiert keine Gruppe mit dem Namen %s"
-#: ../cli.py:1007
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Keine Pakete zum Entfernen aus dem Gruppen gefunden"
-#: ../cli.py:1009
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d Paket(e) zum Entfernen"
-#: ../cli.py:1051
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Paket %s ist bereits installiert, überspringen"
# Meint das nicht eher übergehe? -tl
-#: ../cli.py:1062
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Verwerfe nicht vergleichbare Pakete %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1088
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
-msgstr "Kein anderes %s installiert, füge es zur Liste für eine potentielle Installation hinzu"
+msgstr ""
+"Kein anderes %s installiert, füge es zur Liste für eine potentielle "
+"Installation hinzu"
-#: ../cli.py:1108
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Plugin-Optionen"
-#: ../cli.py:1116
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Kommandozeilen-Fehler: %s"
-#: ../cli.py:1129
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -419,257 +402,258 @@ msgstr ""
"\n"
"%s: %s Option benötigt ein Argument"
-#: ../cli.py:1182
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color kann einen der folgenden Werte haben: auto, always, never"
-#: ../cli.py:1289
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "Hilfeinformation anzeigen und beenden"
-#: ../cli.py:1293
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "fehlertolerant sein"
-#: ../cli.py:1295
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
-msgstr "laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht"
+msgstr ""
+"laufe komplett aus dem Zwischenspeicher, aktualisiere Zwischenspeicher nicht"
-#: ../cli.py:1297
+#: ../cli.py:1306
msgid "config file location"
msgstr "Ort der Konfigurationsdatei"
-#: ../cli.py:1299
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "maximale Befehlswartezeit"
-#: ../cli.py:1301
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "Debugging-Ausgabe-Stufe"
-#: ../cli.py:1305
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "Duplikate, in Repos und in Listen/Suchen-Befehlen, anzeigen"
-#: ../cli.py:1307
+#: ../cli.py:1316
msgid "error output level"
msgstr "Fehler-Ausgabe-Stufe"
-#: ../cli.py:1310
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "Stiller Betrieb"
-#: ../cli.py:1312
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "Wortreicher Betrieb"
-#: ../cli.py:1314
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "Beantwortet alle Fragen mit 'ja'"
-#: ../cli.py:1316
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "Yum-Version anzeigen und Programm beenden"
-#: ../cli.py:1317
+#: ../cli.py:1326
msgid "set install root"
msgstr "Wurzel-Installationsverzeichnis setzen"
-#: ../cli.py:1321
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "aktiviere ein oder mehrere Repositories (Wildcards erlaubt)"
-#: ../cli.py:1325
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "deaktiviere ein oder mehrere Repositories (Wildcards erlaubt)"
-#: ../cli.py:1328
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "schliesse Paket(e) nach Namen oder global aus"
-#: ../cli.py:1330
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "deaktiviere Ausschluss von 'main', einem Repository oder allem"
-#: ../cli.py:1333
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "aktiviere veraltetes Verarbeiten während Aktualisierung"
-#: ../cli.py:1335
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "deaktiviere Yum-Plugins"
-#: ../cli.py:1337
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "deaktiviere GPG-Signatur-Prüfung"
-#: ../cli.py:1339
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "deaktiviere Plugins nach Namen"
-#: ../cli.py:1342
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "aktiviere Plugins nach Namen"
-#: ../cli.py:1345
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "überspringe Pakete mit Abhängigkeitsauflösungsproblemen"
-#: ../cli.py:1347
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "kontrolliert, ob Farbe benutzt wird"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jan"
msgstr "Jan"
-#: ../output.py:303
+#: ../output.py:305
msgid "Feb"
msgstr "Feb"
-#: ../output.py:303
+#: ../output.py:305
msgid "Mar"
msgstr "Mär"
-#: ../output.py:303
+#: ../output.py:305
msgid "Apr"
msgstr "Apr"
-#: ../output.py:303
+#: ../output.py:305
msgid "May"
msgstr "Mai"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jun"
msgstr "Jun"
-#: ../output.py:304
+#: ../output.py:306
msgid "Jul"
msgstr "Jul"
-#: ../output.py:304
+#: ../output.py:306
msgid "Aug"
msgstr "Aug"
-#: ../output.py:304
+#: ../output.py:306
msgid "Sep"
msgstr "Sep"
-#: ../output.py:304
+#: ../output.py:306
msgid "Oct"
msgstr "Okt"
-#: ../output.py:304
+#: ../output.py:306
msgid "Nov"
msgstr "Nov"
-#: ../output.py:304
+#: ../output.py:306
msgid "Dec"
msgstr "Dez"
-#: ../output.py:314
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Versuche anderen Spiegel-Server."
-#: ../output.py:536
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Name : %s%s%s"
-#: ../output.py:537
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Architektur : %s"
-#: ../output.py:539
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Epoch : %s"
-#: ../output.py:540
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Version : %s"
-#: ../output.py:541
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Ausgabe : %s"
-#: ../output.py:542
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Grösse : %s"
-#: ../output.py:543
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:545
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Aus repo : %s"
-#: ../output.py:547
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Übermittler : %s"
-#: ../output.py:548
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Übermittlungszeit : %s"
-#: ../output.py:549
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Build-Zeit : %s"
-#: ../output.py:551
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Installationszeit: %s"
-#: ../output.py:552
+#: ../output.py:554
msgid "Summary : "
msgstr "Zusammenfassung : "
-#: ../output.py:554
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:555
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Lizenz : %s"
-#: ../output.py:556
+#: ../output.py:558
msgid "Description: "
msgstr "Beschreibung:"
-#: ../output.py:624
+#: ../output.py:626
msgid "y"
msgstr "j"
-#: ../output.py:624
+#: ../output.py:626
msgid "yes"
msgstr "ja"
-#: ../output.py:625
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:625
+#: ../output.py:627
msgid "no"
msgstr "nein"
-#: ../output.py:629
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "Ist dies in Ordnung? [j/N] :"
-#: ../output.py:720
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -678,142 +662,141 @@ msgstr ""
"\n"
"Gruppe: %s"
-#: ../output.py:724
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " Gruppen-ID: %s"
-#: ../output.py:729
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Beschreibung: %s"
-#: ../output.py:731
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Obligatorische Pakete:"
-#: ../output.py:732
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Standard-Pakete:"
-#: ../output.py:733
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " Optionale Pakete:"
-#: ../output.py:734
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Zwangsbedingte Pakete:"
-#: ../output.py:754
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "Paket: %s"
-#: ../output.py:756
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Keine Abhängigkeiten für dieses Paket"
-#: ../output.py:761
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " Abhängigkeit: %s"
-#: ../output.py:763
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Nicht erfüllte Abhängigkeit"
-#: ../output.py:835
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:836
+#: ../output.py:838
msgid "Matched from:"
msgstr "Übereinstimmung von:"
-#: ../output.py:845
+#: ../output.py:847
msgid "Description : "
msgstr "Beschreibung : "
-#: ../output.py:848
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:851
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Lizenz : %s"
-#: ../output.py:854
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Dateiname : %s"
-#: ../output.py:858
+#: ../output.py:860
msgid "Other : "
msgstr "Andere : "
-#: ../output.py:891
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "Fehler beim Berechnen der Gesamtgrösse der Downloads"
-#: ../output.py:896
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Gesamtgrösse: %s"
-#: ../output.py:899
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Gesamte Downloadgrösse: %s"
-#: ../output.py:941
+#: ../output.py:942
msgid "Reinstalling"
msgstr "Neuinstallieren"
-#: ../output.py:942
+#: ../output.py:943
msgid "Downgrading"
msgstr "Downgrading"
-#: ../output.py:943
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Installiert für Abhängigkeiten"
-#: ../output.py:944
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Aktualisiert für Abhängigkeiten"
-#: ../output.py:945
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Entfernt für Abhängigkeiten"
-#: ../output.py:952
-#: ../output.py:1062
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Übersprungen (Abhängigkeitsprobleme)"
-#: ../output.py:973
+#: ../output.py:976
msgid "Package"
msgstr "Paket"
-#: ../output.py:973
+#: ../output.py:976
msgid "Arch"
msgstr "Arch"
-#: ../output.py:974
+#: ../output.py:977
msgid "Version"
msgstr "Version"
-#: ../output.py:974
+#: ../output.py:977
msgid "Repository"
msgstr "Repository"
-#: ../output.py:975
+#: ../output.py:978
msgid "Size"
msgstr "Grösse"
-#: ../output.py:987
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -822,7 +805,7 @@ msgstr ""
" ersetze %s%s%s.%s %s\n"
"\n"
-#: ../output.py:996
+#: ../output.py:999
#, python-format
msgid ""
"\n"
@@ -833,7 +816,7 @@ msgstr ""
"Vorgangsübersicht\n"
"%s\n"
-#: ../output.py:1003
+#: ../output.py:1006
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
@@ -842,7 +825,7 @@ msgstr ""
"Installieren %5.5s Paket(e)\n"
"Upgrade %5.5s Paket(e)\n"
-#: ../output.py:1012
+#: ../output.py:1015
#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
@@ -853,32 +836,32 @@ msgstr ""
"Neuinstallieren %5.5s Paket(e)\n"
"Downgrade %5.5s Paket(e)\n"
-#: ../output.py:1056
+#: ../output.py:1059
msgid "Removed"
msgstr "Entfernt"
-#: ../output.py:1057
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Abhängigkeiten entfernt"
-#: ../output.py:1059
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Abhängigkeit installiert"
-#: ../output.py:1061
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Abhängigkeit aktualisiert"
-#: ../output.py:1063
+#: ../output.py:1066
msgid "Replaced"
msgstr "Ersetzt "
-#: ../output.py:1064
+#: ../output.py:1067
msgid "Failed"
msgstr "Fehlgeschlagen"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1130
+#: ../output.py:1133
msgid "two"
msgstr "zwei"
@@ -886,94 +869,273 @@ msgstr "zwei"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1141
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds\n"
"to exit.\n"
msgstr ""
"\n"
-" Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s innerhalb %s%s%s Sekunden\n"
+" Aktueller Download abgebrochen, %s unterbrechen Sie (Ctrl-c) erneut %s "
+"innerhalb %s%s%s Sekunden\n"
"zum Beenden.\n"
-#: ../output.py:1152
+#: ../output.py:1155
msgid "user interrupt"
msgstr "Benutzer-Unterbrechung"
-#: ../output.py:1168
+#: ../output.py:1173
msgid "Total"
msgstr "Gesamt"
-#: ../output.py:1183
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Führe Verarbeitung durch"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Prüffehler bei Verarbeitung:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Andere : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#, fuzzy
+msgid "Return-Code :"
+msgstr "Repo-ID : "
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Veraltet"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Fehlgeschlagen"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Prüffehler bei Verarbeitung:\n"
+
+#: ../output.py:1405
+#, fuzzy
+msgid "Downgraded"
+msgstr "Downgrading"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Keine Pakete bereitgestellt"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Fehler: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "installiert"
-#: ../output.py:1184
+#: ../output.py:1525
msgid "updated"
msgstr "aktualisiert"
-#: ../output.py:1185
+#: ../output.py:1526
msgid "obsoleted"
msgstr "veraltet"
-#: ../output.py:1186
+#: ../output.py:1527
msgid "erased"
msgstr "gelöscht"
# Dies ist das Sorgenkind. So weit ich weiss, werden die Verben von oben bezogen. Eventuell könnte auch eine radikale Änderung eine Lösung sein. Fabian
-#: ../output.py:1190
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paket %s.%s %s:%s-%s markiert, um %s zu werden"
-#: ../output.py:1197
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Führe Transaktionsprüfung aus"
-#: ../output.py:1202
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Starte Abhängigkeitsauflösung mit den neuen Änderungen neu."
-#: ../output.py:1207
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Abhängigkeitsauflösung beendet"
-#: ../output.py:1212
-#: ../output.py:1217
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Verarbeite Abhängigkeiten: %s für Paket: %s"
-#: ../output.py:1221
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nicht aufgelöste Abhängigkeit: %s"
-#: ../output.py:1227
-#: ../output.py:1232
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Verarbeite Konflikt: %s kollidiert mit %s"
-#: ../output.py:1236
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Fülle Verarbeitungsset mit ausgewählten Paketen. Bitte warten."
-#: ../output.py:1240
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Lade Header für %s herunter, um ins Verarbeitungsset zu packen."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Beende nach Abbruch durch den Benutzer"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Beende wegen defekter Pipe"
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Komplett!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Sie müssen root sein, um diesen Befehl ausführen zu können."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
-"However, you do not have any GPG public keys installed. You need to download\n"
+"However, you do not have any GPG public keys installed. You need to "
+"download\n"
"the keys for packages you wish to install and install them.\n"
"You can do that by running the command:\n"
" rpm --import public.gpg.key\n"
@@ -986,8 +1148,10 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
"\n"
-"Sie haben das Überprüfen der Pakete via GPG-Schlüssel aktiviert. Dies ist eine gute Sache. \n"
-"Allerdings haben Sie nicht alle öffentlichen GPG-Schlüssel installiert. Sie müssen die\n"
+"Sie haben das Überprüfen der Pakete via GPG-Schlüssel aktiviert. Dies ist "
+"eine gute Sache. \n"
+"Allerdings haben Sie nicht alle öffentlichen GPG-Schlüssel installiert. Sie "
+"müssen die\n"
"gewünschten Schlüssel für die Pakete herunterladen und installieren.\n"
"Sie können dies mit folgendem Befehl machen:\n"
" rpm --import public.gpg.key\n"
@@ -997,322 +1161,353 @@ msgstr ""
"für ein Repository, durch die 'gpgkey'-Option in einem Repository-Bereich\n"
"angeben, und yum wird ihn für Sie installieren.\n"
"\n"
-"Für weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-Anbieter.\n"
+"Für weitere Informationen kontaktieren Sie Ihren Distributions- oder Paket-"
+"Anbieter.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Fehler: Muss eine Liste von Paketen an %s übergeben"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Fehler: Brauche einen Begriff, der passt"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Fehler: Brauche eine Gruppe oder eine Liste von Gruppen"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Fehler: Aufräumen benötigt eine Option: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Fehler: Ungültiges Argument für Aufräumen: %r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Kein Argument für Shell"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Dateinamen an Shell übergeben: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr "Datei %s, angegeben als Argument für Shell, existiert nicht."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr "Fehler: mehr als eine Datei als Argument an die Shell übergeben."
-#: ../yumcommands.py:173
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAKET..."
-#: ../yumcommands.py:176
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Installiere ein Paket oder Pakete auf Ihrem System"
-#: ../yumcommands.py:184
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Einrichten des Installationsprozess"
-#: ../yumcommands.py:198
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAKET...]"
-#: ../yumcommands.py:201
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Aktualisiere ein Paket oder Pakete auf Ihrem System"
-#: ../yumcommands.py:208
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Einrichten des Aktualisierungsprozess"
-#: ../yumcommands.py:256
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Zeige Details über ein Paket oder einer Gruppe von Pakete an"
-#: ../yumcommands.py:305
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Installierte Pakete"
-#: ../yumcommands.py:313
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Verfügbare Pakete"
-#: ../yumcommands.py:317
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Extra-Pakete"
-#: ../yumcommands.py:321
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Aktualisierte Pakete"
#. This only happens in verbose mode
-#: ../yumcommands.py:329
-#: ../yumcommands.py:336
-#: ../yumcommands.py:630
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Veraltete Pakete"
-#: ../yumcommands.py:338
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Kürzlich hinzugefügte Pakete"
-#: ../yumcommands.py:345
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Keine übereinstimmenden Pakete zum Auflisten"
-#: ../yumcommands.py:362
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Liste von Paketen oder Gruppen von Paketen"
-#: ../yumcommands.py:376
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Entferne ein Paket oder Pakete auf Ihrem System"
-#: ../yumcommands.py:383
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Einrichten des Entfernungsprozess"
-#: ../yumcommands.py:400
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Einrichten des Gruppenprozess"
-#: ../yumcommands.py:406
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Keine Gruppe, auf welcher der Befehl ausgeführt werden kann"
-#: ../yumcommands.py:419
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Verfügbare Gruppen anzeigen"
-#: ../yumcommands.py:436
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Installiere die Pakete in einer Gruppe auf Ihrem System"
-#: ../yumcommands.py:458
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Entferne die Pakete in einer Gruppe von Ihrem System"
-#: ../yumcommands.py:485
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Zeigt Details über eine Paket-Gruppe an"
-#: ../yumcommands.py:511
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Generiere den Metadaten-Zwischenspeicher"
-#: ../yumcommands.py:517
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Erstelle Zwischenspeicherungsdatei für alle Metadaten-Dateien."
-#: ../yumcommands.py:518
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
-msgstr "Dies kann eine Weile dauern, abhängig von der Geschwindigkeit dieses Computers"
+msgstr ""
+"Dies kann eine Weile dauern, abhängig von der Geschwindigkeit dieses "
+"Computers"
-#: ../yumcommands.py:539
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Metadaten-Zwischenspeicher erstellt"
-#: ../yumcommands.py:555
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Entferne gespeicherte Daten"
-#: ../yumcommands.py:578
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Suche ein Paket, das den gegebenen Wert bereitstellt"
-#: ../yumcommands.py:601
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Überprüfe auf verfügbare Paket-Aktualisierungen"
-#: ../yumcommands.py:653
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Suche nach Paket-Details für die gegebene Zeichenkette"
-#: ../yumcommands.py:659
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Suche Pakete:"
-#: ../yumcommands.py:679
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Aktualisiere Pakete, berücksichtige veraltete"
# Gibt es einen Unterschied zwischen Update und Upgrade Process? -tl
-#: ../yumcommands.py:687
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Einrichten des Upgradeprozesses"
-#: ../yumcommands.py:704
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Installiere ein lokales RPM"
-#: ../yumcommands.py:712
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Einrichten der lokalen Paketverarbeitung"
-#: ../yumcommands.py:734
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Bestimme, welche Pakete die gegebenen Abhängigkeiten bereitstellen"
-#: ../yumcommands.py:737
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Suche Pakete für Abhängigkeit:"
-#: ../yumcommands.py:754
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Führe eine interaktive Yum-Shell aus"
-#: ../yumcommands.py:760
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Einrichten der Yum-Shell"
-#: ../yumcommands.py:781
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Liste von Paket-Abhängigkeiten"
-#: ../yumcommands.py:787
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Suche Abhängigkeiten:"
-#: ../yumcommands.py:805
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Zeige die konfigurierten Software-Repositories an"
-#: ../yumcommands.py:853
-#: ../yumcommands.py:854
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "aktiviert"
-#: ../yumcommands.py:862
-#: ../yumcommands.py:863
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "deaktiviert"
-#: ../yumcommands.py:877
-msgid "Repo-id : "
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
msgstr "Repo-ID : "
-#: ../yumcommands.py:878
-msgid "Repo-name : "
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
msgstr "Repo-Name : "
-#: ../yumcommands.py:879
-msgid "Repo-status : "
+#: ../yumcommands.py:836
+#, fuzzy
+msgid "Repo-status : "
msgstr "Repo-Status : "
-#: ../yumcommands.py:881
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Repo-Revision: "
-#: ../yumcommands.py:885
-msgid "Repo-tags : "
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
msgstr "Repo-Tags : "
-#: ../yumcommands.py:891
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Repo-Distro-Tags: "
-#: ../yumcommands.py:896
-msgid "Repo-updated: "
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
msgstr "Repo aktualisiert:"
-#: ../yumcommands.py:898
-msgid "Repo-pkgs : "
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
msgstr "Repo-PKGS : "
-#: ../yumcommands.py:899
-msgid "Repo-size : "
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
msgstr "Repo-Grösse : "
-#: ../yumcommands.py:906
-msgid "Repo-baseurl: "
+#: ../yumcommands.py:863
+#, fuzzy
+msgid "Repo-baseurl : "
msgstr "Repo BaseURL:"
-#: ../yumcommands.py:914
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Repo-Metalink: "
-#: ../yumcommands.py:918
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Aktualisiert : "
-#: ../yumcommands.py:921
-msgid "Repo-mirrors: "
+#: ../yumcommands.py:878
+#, fuzzy
+msgid "Repo-mirrors : "
msgstr "Repo-Spiegel: "
-#: ../yumcommands.py:925
-msgid "Repo-exclude: "
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, fuzzy, python-format
+msgid "Instant (last: %s)"
+msgstr "Installationszeit: %s"
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:895
+#, fuzzy
+msgid "Repo-expire : "
+msgstr "Repo-Grösse : "
+
+#: ../yumcommands.py:898
+#, fuzzy
+msgid "Repo-exclude : "
msgstr "Repo ausgeschlossen:"
-#: ../yumcommands.py:929
-msgid "Repo-include: "
+#: ../yumcommands.py:902
+#, fuzzy
+msgid "Repo-include : "
msgstr "Repo eingeschlossen:"
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:939
-#: ../yumcommands.py:965
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "Repo-ID"
-#: ../yumcommands.py:953
-#: ../yumcommands.py:954
-#: ../yumcommands.py:968
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "Status"
-#: ../yumcommands.py:966
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "Repo-Name:"
-#: ../yumcommands.py:1010
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Zeigt eine kurze Verwendungsinformation"
-#: ../yumcommands.py:1048
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Keine Hilfe für %s vorhanden"
-#: ../yumcommands.py:1053
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1322,7 +1517,7 @@ msgstr ""
"\n"
"Aliase: "
-#: ../yumcommands.py:1055
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1332,140 +1527,140 @@ msgstr ""
"\n"
"Alias: "
-#: ../yumcommands.py:1071
-msgid "Command"
-msgstr "Befehl"
-
-#: ../yumcommands.py:1082
-msgid "Created"
-msgstr "Erzeugt"
-
-#: ../yumcommands.py:1083
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: ../yumcommands.py:1130
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Einrichten des Neuinstallationsprozess"
-#: ../yumcommands.py:1138
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "Installiere Paket neu"
-#: ../yumcommands.py:1159
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Einrichten des Downgrade-Prozesses"
-#: ../yumcommands.py:1166
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "Downgrade eines Pakets"
-#: ../yumcommands.py:1183
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
-msgstr "Eine Version für das System und/oder die verfügbaren Repositories anzeigen."
+msgstr ""
+"Eine Version für das System und/oder die verfügbaren Repositories anzeigen."
+
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " Gruppen-ID: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Paket"
-#: ../yumcommands.py:1210
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "Installiert:"
-#: ../yumcommands.py:1219
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Installiert:"
+
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "Verfügbar:"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Verfügbar:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
msgstr ""
-"\n"
-"\n"
-"Beende nach Abbruch durch den Benutzer"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
msgstr ""
-"\n"
-"\n"
-"Beende wegen defekter Pipe"
-#: ../yummain.py:126
+#: ../yummain.py:128
msgid "Running"
msgstr "Läuft"
-#: ../yummain.py:127
+#: ../yummain.py:129
msgid "Sleeping"
msgstr "Schläft"
-#: ../yummain.py:128
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "Nicht unterbrechbar"
-#: ../yummain.py:129
+#: ../yummain.py:131
msgid "Zombie"
msgstr "Zombie"
-#: ../yummain.py:130
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr "Verfolgt/Gestoppt"
-#: ../yummain.py:131
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: ../yummain.py:135
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " Die andere Anwendung ist: PackageKit"
-#: ../yummain.py:137
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " Die andere Anwendung ist: %s"
-#: ../yummain.py:140
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Speicher : %5s RSS (%5sB VSZ)"
-#: ../yummain.py:144
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " Gestartet: %s - vor %s"
-#: ../yummain.py:146
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " Status : %s, pid: %d"
-#: ../yummain.py:171
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet wird ..."
+#: ../yummain.py:173
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr ""
+"Eine andere Anwendung blockiert momentan yum. Warte, dass sie beendet "
+"wird ..."
-#: ../yummain.py:199
-#: ../yummain.py:238
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Fehler: %s"
-#: ../yummain.py:209
-#: ../yummain.py:251
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Unbekannte(r) Fehler: Exit Code: %d:"
#. Depsolve stage
-#: ../yummain.py:216
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "Löse Abhängigkeiten auf"
-#: ../yummain.py:240
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
-msgstr " Sie können versuchen --skip-broken zu benutzen, um das Problem zu umgehen."
+msgstr ""
+" Sie können versuchen --skip-broken zu benutzen, um das Problem zu umgehen."
-#: ../yummain.py:241
+#: ../yummain.py:243
msgid ""
" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
@@ -1475,7 +1670,7 @@ msgstr ""
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"
-#: ../yummain.py:257
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1483,12 +1678,8 @@ msgstr ""
"\n"
"Abhängigkeiten aufgelöst"
-#: ../yummain.py:271
-msgid "Complete!"
-msgstr "Komplett!"
-
# Ist eine ziemlich unschöne Übersetzung...Vorschläge? Fabian
-#: ../yummain.py:318
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1498,201 +1689,198 @@ msgstr ""
"\n"
"Verlasse nach Abbruch durch den Benutzer."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
-msgstr "Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist"
+msgstr ""
+"Konfiguriere TransactionSets, bevor die Konfigurationsklasse gestartet ist"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Ungültiges tsflag in Konfigurationsdatei: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Suche pkgSack für Abhängigkeiten: %s"
-#: ../yum/depsolve.py:183
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Potentielle Übereinstimmung für %s von %s"
-#: ../yum/depsolve.py:191
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Übereinstimmung von %s, welche gebraucht wird für %s"
-#: ../yum/depsolve.py:232
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Mitglied: %s"
-#: ../yum/depsolve.py:246
-#: ../yum/depsolve.py:759
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s konvertiert zum Installieren"
-#: ../yum/depsolve.py:253
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Füge Paket %s hinzu in Modus %s"
-#: ../yum/depsolve.py:263
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Entferne Paket %s"
-#: ../yum/depsolve.py:285
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s benötigt: %s"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Benötigte Anforderung wurde bereits nachgeschlagen, betrüge"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Benötigte Anforderung ist kein Paket-Name. Schlage nach: %s"
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Potentieller Anbieter: %s"
-#: ../yum/depsolve.py:383
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Modus ist %s für Anbieter von %s: %s"
-#: ../yum/depsolve.py:387
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Modus für pkg-Bereitstellung %s: %s"
-#: ../yum/depsolve.py:391
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: %s Paket benötigt %s, welches als gelöscht markiert ist"
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: Ersetze %s durch %s zum Auflösen der Abhängigkeit."
-#: ../yum/depsolve.py:407
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Aktualisiere %s zum Auflösen der Abhängigkeit."
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Kann keinen Aktualisierungspfad finden für Abhängigkeit für: %s"
-#: ../yum/depsolve.py:425
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Unlösbare Anforderung %s für %s"
-#: ../yum/depsolve.py:448
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Übereinstimmung von %s, welche gebraucht wird für %s"
#. is it already installed?
-#: ../yum/depsolve.py:490
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
-msgstr "%s ist in einem bereitgestellten Paket, aber bereits installiert, entferne."
+msgstr ""
+"%s ist in einem bereitgestellten Paket, aber bereits installiert, entferne."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Potentielles aufgelöstes Paket %s hat eine neuere Instanz in ts."
-#: ../yum/depsolve.py:517
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Potentielles aufgelöste Paket %s hat eine neuere Instanz installiert."
-#: ../yum/depsolve.py:525
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Fehlende Abhängigkeit: %s wird benötigt von Paket %s"
-#: ../yum/depsolve.py:538
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s bereits in ts, überspringe dieses"
-#: ../yum/depsolve.py:584
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Markiere %s als Aktualisierung für %s"
-#: ../yum/depsolve.py:592
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Markiere %s als Installation für %s"
-#: ../yum/depsolve.py:695
-#: ../yum/depsolve.py:777
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Erfolg - Leere Transaktion"
-#: ../yum/depsolve.py:734
-#: ../yum/depsolve.py:749
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Starte Schleife neu"
-#: ../yum/depsolve.py:765
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Abhängigkeitsverarbeitung beendet"
-#: ../yum/depsolve.py:771
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s von %s hat Abhängigkeitsauflöse-Probleme"
-#: ../yum/depsolve.py:778
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Erfolg - Abhängigkeiten aufgelöst"
-#: ../yum/depsolve.py:792
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Prüfe Abhängigkeiten für %s"
-#: ../yum/depsolve.py:875
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "Suche nach %s als eine Anforderung von %s"
-#: ../yum/depsolve.py:1017
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Führe compare_providers() aus für %s"
-#: ../yum/depsolve.py:1051
-#: ../yum/depsolve.py:1057
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "bessere Architektur in po %s"
-#: ../yum/depsolve.py:1132
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s ersetzt %s"
-#: ../yum/depsolve.py:1144
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1701,120 +1889,124 @@ msgstr ""
"archdist verglichen %s zu %s auf %s\n"
" Gewinner: %s"
-#: ../yum/depsolve.py:1151
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "Gemeinsames Quellen-RPM %s und %s"
-#: ../yum/depsolve.py:1157
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "Gemeinsamer Prefix von %s zwischen %s und %s"
# Hat jemand eine Idee für eine bessere Übersetzung? Fabian
-#: ../yum/depsolve.py:1165
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Beste Bestellung: %s"
-#: ../yum/__init__.py:180
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:401
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Bei Repository %r fehlt der Name in der Konfiguration, benutze id"
-#: ../yum/__init__.py:439
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "Plugins bereits initialisiert"
-#: ../yum/__init__.py:446
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:457
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Lese lokale RPMDB"
-#: ../yum/__init__.py:478
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:498
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() wird in zukünftigen Versionen von Yum verschwinden \n"
-#: ../yum/__init__.py:528
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Einrichten des Paket-Behälters"
-#: ../yum/__init__.py:573
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "Repository-Objekt für Repository %s fehlt eine _resetSack-Methode\n"
-#: ../yum/__init__.py:574
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "deshalb kann dieses Repository nicht zurückgesetzt werden.\n"
-#: ../yum/__init__.py:579
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() wird in zukünftigen Versionen von Yum verschwinden.\n"
-#: ../yum/__init__.py:591
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Baue Aktualisierungsobjekt"
-#: ../yum/__init__.py:626
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() wird in zukünftigen Versionen von Yum verschwinden .\n"
-#: ../yum/__init__.py:651
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Beziehe Gruppen-Metadaten"
-#: ../yum/__init__.py:677
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Füge Gruppen-Datei von Repository hinzu: %s"
-#: ../yum/__init__.py:686
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Hinzufügen von Gruppen-Datei für Repository fehlgeschlagen: %s - %s"
-#: ../yum/__init__.py:692
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Keine Gruppen in irgendeinem Repository verfügbar"
-#: ../yum/__init__.py:742
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Importiere zusätzlichen Dateilisten-Informationen"
-#: ../yum/__init__.py:756
+#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr "Das Programm %s%s%s wurde in im yum-utils-Paket gefunden."
-#: ../yum/__init__.py:764
-msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
-msgstr "Es gibt noch nicht abgeschlossene Transaktionen. Sie sollten in Betracht ziehen, zuerst yum-complete-transaction auszuführen, um diese abzuschliessen."
+#: ../yum/__init__.py:785
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+"Es gibt noch nicht abgeschlossene Transaktionen. Sie sollten in Betracht "
+"ziehen, zuerst yum-complete-transaction auszuführen, um diese abzuschliessen."
# Ob da die Übersetzung den Punkt trifft...Fabian
-#: ../yum/__init__.py:832
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Überspringe defekte Runde %i"
# Ob da die Übersetzung den Punkt trifft...Fabian
-#: ../yum/__init__.py:884
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Überspringen der defekte brachte %i Runden"
-#: ../yum/__init__.py:885
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1822,70 +2014,80 @@ msgstr ""
"\n"
"Pakete übersprungen wegen Abhängigkeitsproblemen:"
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s von %s"
-#: ../yum/__init__.py:1027
-msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr "Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der Verarbeitung aufgetreten."
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+"Warnung: Es sind Scriptlet- oder andere nicht-fatale Fehler bei der "
+"Verarbeitung aufgetreten."
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Entfernen der Verarbeitungsdatei %s fehlgeschlagen"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s hätte installiert werden sollen, wurde aber nicht!"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1110
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s hätte entfernt werden sollen, wurde aber nicht!"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1226
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Unfähig zu prüfen, ob PID %s ist aktiv"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1230
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Existierende Blockierung %s: eine andere Kopie läuft mit PID %s."
-#: ../yum/__init__.py:1307
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Paket stimmt nicht mit dem vorgesehenen Herunterladen überein."
-#: ../yum/__init__.py:1322
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Konnte Prüfsumme nicht bilden"
-#: ../yum/__init__.py:1325
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Paket stimmt nicht mit der Prüfsumme überein"
-#: ../yum/__init__.py:1367
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
-msgstr "Paket bei Prüfsummen-Prüfung durchgefallen, aber Zwischenspeicherung ist aktiviert für %s"
+msgstr ""
+"Paket bei Prüfsummen-Prüfung durchgefallen, aber Zwischenspeicherung ist "
+"aktiviert für %s"
-#: ../yum/__init__.py:1370
-#: ../yum/__init__.py:1399
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "benutze lokale Kopie von %s"
-#: ../yum/__init__.py:1411
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1896,403 +2098,406 @@ msgstr ""
" * frei %s\n"
" * benötigt %s"
-#: ../yum/__init__.py:1460
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Header ist nicht vollständig."
-#: ../yum/__init__.py:1497
+#: ../yum/__init__.py:1563
#, python-format
-msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
-msgstr "Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus aktiviert. Kann %s nicht herunterladen"
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+msgstr ""
+"Header ist nicht im lokalen Zwischenspeicher und Nur-Zwischenspeicher-Modus "
+"aktiviert. Kann %s nicht herunterladen"
-#: ../yum/__init__.py:1552
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Öffentlicher Schlüssel für %s ist nicht installiert"
-#: ../yum/__init__.py:1556
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problem beim Öffnen des Paketes %s"
-#: ../yum/__init__.py:1564
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Öffentlicher Schlüssel für %s ist nicht vertrauenswürdig"
-#: ../yum/__init__.py:1568
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Paket %s ist nicht unterschrieben"
-#: ../yum/__init__.py:1606
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Kann %s nicht entfernen"
-#: ../yum/__init__.py:1610
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s entfernt"
-#: ../yum/__init__.py:1646
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Kann %s Datei nicht entfernen %s"
-#: ../yum/__init__.py:1650
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s Datei %s entfernt"
-#: ../yum/__init__.py:1652
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s Dateien entfernt"
-#: ../yum/__init__.py:1721
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Mehr als eine identische Übereinstimmung im Behälter für %s"
-#: ../yum/__init__.py:1727
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Keine Übereinstimmungen mit %s.%s %s:%s-%s bei der Aktualisierung"
-#: ../yum/__init__.py:1960
-msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
-msgstr "searchPackages() wird in zukünftigen Versionen von Yum verschwinden. Benutze stattdessen searchGenerator(). \n"
+#: ../yum/__init__.py:2026
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum. Use searchGenerator() instead. \n"
+msgstr ""
+"searchPackages() wird in zukünftigen Versionen von Yum "
+"verschwinden. Benutze stattdessen searchGenerator(). \n"
-#: ../yum/__init__.py:2002
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Suche %d Pakete"
-#: ../yum/__init__.py:2006
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "Suche Paket %s"
-#: ../yum/__init__.py:2018
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "Suche in Datei-Einträgen"
-#: ../yum/__init__.py:2025
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "suche in bereitgestellten Einträgen"
-#: ../yum/__init__.py:2058
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Stelle Übereinstimmung bereit: %s"
-#: ../yum/__init__.py:2107
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Keine Gruppendaten für konfigurierte Repositories verfügbar"
-#: ../yum/__init__.py:2138
-#: ../yum/__init__.py:2157
-#: ../yum/__init__.py:2188
-#: ../yum/__init__.py:2194
-#: ../yum/__init__.py:2273
-#: ../yum/__init__.py:2277
-#: ../yum/__init__.py:2582
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Kein Gruppe mit dem Namen %s vorhanden"
-#: ../yum/__init__.py:2169
-#: ../yum/__init__.py:2290
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "Paket %s war nicht markiert in Gruppe %s"
-#: ../yum/__init__.py:2216
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Füge Paket %s aus Gruppe %s hinzu"
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Kein Paket mit Namen %s verfügbar zum Installieren"
# Paket-Behälter wird sicher nicht allen gefallen. Fabian
-#: ../yum/__init__.py:2317
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Paket-Tupel %s kann nicht gefunden werden im Paket-Behälter"
-#: ../yum/__init__.py:2331
-msgid "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr "getInstalledPackageObject() wird verschwinden, benutze self.rpmdb.searchPkgTuple().\n"
+# Paket-Behälter wird sicher nicht allen gefallen. Fabian
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Paket-Tupel %s kann nicht gefunden werden im Paket-Behälter"
-#: ../yum/__init__.py:2387
-#: ../yum/__init__.py:2432
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Ungültiges Versionsflag"
-#: ../yum/__init__.py:2402
-#: ../yum/__init__.py:2407
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Kein Paket gefunden für %s"
-#: ../yum/__init__.py:2615
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Paketobjekt war keine Paketobjektinstanz"
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Nichts angegeben zum Installieren"
-#: ../yum/__init__.py:2635
-#: ../yum/__init__.py:3374
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
-msgstr "Überprüfe nach virtueller Bereitstellung oder Datei-Bereitstellung für %s"
+msgstr ""
+"Überprüfe nach virtueller Bereitstellung oder Datei-Bereitstellung für %s"
-#: ../yum/__init__.py:2641
-#: ../yum/__init__.py:2937
-#: ../yum/__init__.py:3104
-#: ../yum/__init__.py:3380
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Kein Übereinstimmung für Argument: %s"
-#: ../yum/__init__.py:2715
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Paket %s installiert und nicht verfügbar"
-#: ../yum/__init__.py:2718
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Kein(e) Paket(e) zum Installieren verfügbar."
-#: ../yum/__init__.py:2730
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Paket: %s - bereits im Transaktionsset"
-#: ../yum/__init__.py:2756
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "Paket %s wurde ersetzt durch %s, welches bereits installiert ist"
-#: ../yum/__init__.py:2759
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren."
+msgstr ""
+"Paket %s wurde ersetzt durch %s, versuche stattdessen %s zu installieren."
-#: ../yum/__init__.py:2767
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Paket %s ist bereits in der neusten Version installiert."
-#: ../yum/__init__.py:2781
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
-msgstr "Paket, das auf %s passt, ist bereits installiert. Überprüfe auf Aktualisierung."
+msgstr ""
+"Paket, das auf %s passt, ist bereits installiert. Überprüfe auf "
+"Aktualisierung."
#. update everything (the easy case)
-#: ../yum/__init__.py:2870
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Aktualisiere alles"
-#: ../yum/__init__.py:2891
-#: ../yum/__init__.py:3002
-#: ../yum/__init__.py:3031
-#: ../yum/__init__.py:3058
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2926
-#: ../yum/__init__.py:3101
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2993
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Paket ist bereits veraltet: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3026
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Aktualisiere Paket nicht, da es bereits veraltet ist: %s"
-#: ../yum/__init__.py:3035
-#: ../yum/__init__.py:3062
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Aktualisiere Paket nicht, da es bereits aktualisiert ist: %s.%s %s:%s-%s"
+msgstr ""
+"Aktualisiere Paket nicht, da es bereits aktualisiert ist: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3117
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Kein Paket stimmt zum Entfernen überein"
-#: ../yum/__init__.py:3151
-#: ../yum/__init__.py:3242
-#: ../yum/__init__.py:3329
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Kann Datei nicht öffnen: %s. Überspringe."
-#: ../yum/__init__.py:3154
-#: ../yum/__init__.py:3245
-#: ../yum/__init__.py:3332
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Untersuche %s: %s"
-#: ../yum/__init__.py:3162
-#: ../yum/__init__.py:3248
-#: ../yum/__init__.py:3335
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
-msgstr "Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible Architektur: %s"
+msgstr ""
+"Kann Paket %s nicht zur Transaktion hinzufügen. Keine kompatible "
+"Architektur: %s"
-#: ../yum/__init__.py:3170
+#: ../yum/__init__.py:3270
#, python-format
-msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
-msgstr "Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie stattdessen yum install aus, um es zu installieren."
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr ""
+"Paket %s nicht installiert, kann es nicht aktualisieren. Führen Sie "
+"stattdessen yum install aus, um es zu installieren."
-#: ../yum/__init__.py:3205
-#: ../yum/__init__.py:3259
-#: ../yum/__init__.py:3346
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Schliesse %s aus"
-#: ../yum/__init__.py:3210
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Markiere %s zum Installieren"
-#: ../yum/__init__.py:3216
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Markiere %s als eine Aktualisierung für %s"
-#: ../yum/__init__.py:3223
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: aktualisiert installierte Pakete nicht."
-#: ../yum/__init__.py:3278
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "Probleme beim Neuinstallieren: kein Paket stimmt zum Entfernen überein"
-#: ../yum/__init__.py:3290
-#: ../yum/__init__.py:3407
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Paket %s darf mehrfach installiert sein, überspringe"
-#: ../yum/__init__.py:3308
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
-msgstr "Probleme beim Neuinstallieren: kein Paket %s stimmt zum Installieren überein"
+msgstr ""
+"Probleme beim Neuinstallieren: kein Paket %s stimmt zum Installieren überein"
-#: ../yum/__init__.py:3399
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Kein(e) Paket(e) zum Downgrade verfügbar"
-#: ../yum/__init__.py:3443
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Keine Übereinstimmung der verfügbare Pakete: %s"
-#: ../yum/__init__.py:3449
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Nur verfügbare Paket aktualisieren: %s"
-#: ../yum/__init__.py:3508
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Paket(e) zum Downgrade"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "GPG-Schlüssel abrufen von %s"
-#: ../yum/__init__.py:3528
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "GPG-Schlüssel-Abruf fehlgeschlagen:"
-#: ../yum/__init__.py:3539
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "GPG-Schlüssel-Analyse fehlgeschlagen: Schlüssel hat keinen Wert %s"
-#: ../yum/__init__.py:3571
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits installiert"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3576
-#: ../yum/__init__.py:3638
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importiere GPG-Schlüssel 0x%s \"%s\" von %s"
-#: ../yum/__init__.py:3593
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Nicht installierter Schlüssel"
-#: ../yum/__init__.py:3599
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Schlüssel-Import fehlgeschlagen (Code %d)"
-#: ../yum/__init__.py:3600
-#: ../yum/__init__.py:3659
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Schlüssel erfolgreich importiert"
-#: ../yum/__init__.py:3605
-#: ../yum/__init__.py:3664
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+"The GPG keys listed for the \"%s\" repository are already installed but they "
+"are not correct for this package.\n"
"Check that the correct key URLs are configured for this repository."
msgstr ""
-"Die aufgelisteten GPG-Schlüssel für das \"%s\"-Repository sind bereits installiert, aber sie sind nicht korrekt für dieses Paket.\n"
-"Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository konfiguriert sind."
+"Die aufgelisteten GPG-Schlüssel für das \"%s\"-Repository sind bereits "
+"installiert, aber sie sind nicht korrekt für dieses Paket.\n"
+"Stellen Sie sicher, dass die korrekten Schlüssel-URLs für dieses Repository "
+"konfiguriert sind."
-#: ../yum/__init__.py:3614
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Importieren der Schlüssel hat nicht geholfen, falsche Schlüssel?"
-#: ../yum/__init__.py:3633
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG-Schlüssel unter %s (0x%s) ist bereits importiert"
-#: ../yum/__init__.py:3653
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Installierte Schlüssel für Repo %s nicht"
-#: ../yum/__init__.py:3658
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Schlüssel-Import fehlgeschlagen"
-#: ../yum/__init__.py:3779
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Es kann kein geeigneten Spiegelserver gefunden werden."
-#: ../yum/__init__.py:3781
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Beim Herunterladen der Pakete sind Fehler aufgetreten."
-#: ../yum/__init__.py:3822
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Bitte melden Sie diesen Fehler unter %s"
-#: ../yum/__init__.py:3846
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Test-Transaktionsfehler: "
@@ -2301,8 +2506,7 @@ msgstr "Test-Transaktionsfehler: "
msgid "Loaded plugins: "
msgstr "Geladene Plugins: "
-#: ../yum/plugins.py:216
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr "Kein Plugin für Argument: %s"
@@ -2335,8 +2539,10 @@ msgstr "Lade \"%s\"-Plugin"
#: ../yum/plugins.py:316
#, python-format
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "Zwei oder mehr Plugins mit dem Namen \"%s\" existieren im Plugin-Suchpfad"
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+"Zwei oder mehr Plugins mit dem Namen \"%s\" existieren im Plugin-Suchpfad"
#: ../yum/plugins.py:336
#, python-format
@@ -2350,7 +2556,7 @@ msgstr "Konfigurationsdatei %s nicht gefunden"
msgid "Unable to find configuration file for plugin %s"
msgstr "Kann Konfigurationsdatei für Plugin %s nicht finden"
-#: ../yum/plugins.py:497
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "Registrierung von Befehlen nicht unterstützt"
@@ -2361,7 +2567,8 @@ msgstr "Packe neu"
#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
-msgstr "Header kann nicht geöffnet werden oder stimmt nicht überein mit %s, %s."
+msgstr ""
+"Header kann nicht geöffnet werden oder stimmt nicht überein mit %s, %s."
#: ../rpmUtils/oldUtils.py:53
#, python-format
@@ -2376,10 +2583,8 @@ msgstr "Kann RPM-Datenbank nicht öffnen. Wird sie eventuell schon benutzt?"
msgid "Got an empty Header, something has gone wrong"
msgstr "Erhalte einen leeren Header, irgendetwas ging schief"
-#: ../rpmUtils/oldUtils.py:253
-#: ../rpmUtils/oldUtils.py:260
-#: ../rpmUtils/oldUtils.py:263
-#: ../rpmUtils/oldUtils.py:266
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Defekter Header %s"
@@ -2389,8 +2594,25 @@ msgstr "Defekter Header %s"
msgid "Error opening rpm %s - error %s"
msgstr "Fehler bei Öffnen des RPM %s - Fehler %s"
+#~ msgid "Command"
+#~ msgstr "Befehl"
+
+#~ msgid "Created"
+#~ msgstr "Erzeugt"
+
+#~ msgid "Summary"
+#~ msgstr "Zusammenfassung"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() wird verschwinden, benutze self.rpmdb."
+#~ "searchPkgTuple().\n"
+
#~ msgid "Matching packages for package list to user args"
#~ msgstr "Übereinstimmende Pakete für Paket-Liste nach Benutzer-Argument"
+
#~ msgid ""
#~ "\n"
#~ "Transaction Summary\n"
@@ -2405,4 +2627,3 @@ msgstr "Fehler bei Öffnen des RPM %s - Fehler %s"
#~ "Installieren %5.5s Paket(e) \n"
#~ "Aktualisieren %5.5s Paket(e) \n"
#~ "Entfernen %5.5s Paket(e) \n"
-
diff --git a/po/es.po b/po/es.po
index daf6a03..49bf1c4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Fedora Spanish translation of yum.yum-3_2_X.\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-14 10:11+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Héctor Daniel Cabrera <h.daniel.cabrera@gmail.com>\n"
"Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
@@ -17,48 +17,32 @@ msgstr ""
"X-Poedit-Language: Spanish\n"
"X-Poedit-Country: ARGENTINA\n"
-#: ../callback.py:48
-#: ../output.py:940
-#: ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Actualizando"
-#: ../callback.py:49
-#: ../yum/rpmtrans.py:72
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr "Eliminando"
-#: ../callback.py:50
-#: ../callback.py:51
-#: ../callback.py:53
-#: ../output.py:939
-#: ../yum/rpmtrans.py:73
-#: ../yum/rpmtrans.py:74
-#: ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Instalando"
-#: ../callback.py:52
-#: ../callback.py:58
-#: ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr "Obsoleto"
-#: ../callback.py:54
-#: ../output.py:1063
-#: ../output.py:1403
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Actualizado"
-#: ../callback.py:55
-#: ../output.py:1399
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Eliminado"
-#: ../callback.py:56
-#: ../callback.py:57
-#: ../callback.py:59
-#: ../output.py:1061
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
#: ../output.py:1395
msgid "Installed"
msgstr "Instalado"
@@ -81,73 +65,68 @@ msgstr "Error: estado de salida no válido: %s de %s"
msgid "Erased: %s"
msgstr "Eliminado: %s"
-#: ../callback.py:217
-#: ../output.py:941
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Eliminando"
-#: ../callback.py:219
-#: ../yum/rpmtrans.py:77
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr "Limpieza"
-#: ../cli.py:108
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "El comando \"%s\" ya ha sido definido"
-#: ../cli.py:120
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Configurando los repositorios"
-#: ../cli.py:131
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Leyendo en archivos locales los metadatos de los repositorios"
-#: ../cli.py:194
-#: ../utils.py:107
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Error de configuración: %s"
-#: ../cli.py:197
-#: ../cli.py:1253
-#: ../utils.py:110
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Error de opciones: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Instalado: %s-%s en %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Construido: %s en %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Enviado: %s en %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Necesita ingresar algún comando"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Requerimientos de disco:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Como mínimo se necesitan %dMB en el sistema de archivos %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -155,266 +134,259 @@ msgstr ""
"Resumen de errores\n"
"-------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
-msgstr "Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo."
+msgstr ""
+"Se intentó ejecutar la transacción pero no hay nada para hacer. Saliendo."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Saliendo de acuerdo al comando del usuario"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Descargando paquetes:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Error al descargar los paquetes:\n"
-#: ../cli.py:420
-#: ../yum/__init__.py:4014
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Ejecutando el rpm_check_debug"
-#: ../cli.py:429
-#: ../yum/__init__.py:4023
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "ERROR Necesita actualizar el rpm para manipular:"
-#: ../cli.py:431
-#: ../yum/__init__.py:4026
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "ERROR con el rpm_check_debug vs depsolve:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "El RPM necesita ser actualizado"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Por favor, reporte este error en %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Ejecutando prueba de transacción"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Prueba de transacción finalizada"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Error en la verificación de la transacción:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "La prueba de transacción ha sido exitosa"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Ejecutando transacción"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-"Se rechaza la importación automática de claves cuando se ejecuta desatendida.\n"
+"Se rechaza la importación automática de claves cuando se ejecuta "
+"desatendida.\n"
"Utilice \"-y\" para forzar."
-#: ../cli.py:540
-#: ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Tal vez quería decir: "
-#: ../cli.py:557
-#: ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
-msgstr "El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) instalado."
+msgstr ""
+"El (los) paquete(s) %s%s%s se encuentra(n) disponible(s), pero no se ha(n) "
+"instalado."
-#: ../cli.py:571
-#: ../cli.py:602
-#: ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "No existe disponible ningún paquete %s%s%s."
-#: ../cli.py:607
-#: ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Paquete(s) a instalarse"
-#: ../cli.py:608
-#: ../cli.py:686
-#: ../cli.py:719
-#: ../cli.py:741
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Nada para hacer"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paquetes han sido seleccionados para ser actualizados"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "No se han seleccionando paquetes para ser actualizados"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paquetes han sido seleccionados para ser eliminados"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "No se han seleccionado paquetes para ser eliminados"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Paquete(s) a desactualizar"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (desde %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "El paquete instalado %s%s%s%s no se encuentra disponible."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Paquete(s) a reinstalar"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "No se ha ofrecido ningún paquete"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Aviso: No se ha encontrado ningún resultado para: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "No se ha encontrado ningún resultado"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente los nombres de los archivos.\n"
+"Aviso: las versiones 3.0.x de yum podrían hacer corresponder equivocadamente "
+"los nombres de los archivos.\n"
" Puede usar \"%s*/%s%s\" y/o \"%s*bin/%s%s\" para conseguir eso"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "No se ha encontrado ningún paquete para %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Limpiando todo"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Limpiando encabezados"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Limpiando paquetes"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Limpiando metadatos xml"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Limpiando el caché de la base de datos"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Limpiando metadatos expirados del caché"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Limpiando complementos"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Grupos instalados:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Grupos disponibles:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Listo"
-#: ../cli.py:972
-#: ../cli.py:990
-#: ../cli.py:996
-#: ../yum/__init__.py:2629
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Aviso: el grupo %s no existe."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
-msgstr "En los grupos solicitados no existe disponible ningún paquete para ser instalado o actualizado"
+msgstr ""
+"En los grupos solicitados no existe disponible ningún paquete para ser "
+"instalado o actualizado"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paquete(s) a instalar"
-#: ../cli.py:1012
-#: ../yum/__init__.py:2641
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "No existe ningún grupo denominado %s"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "No existen paquetes a eliminarse de los grupos"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paquete(s) a eliminar"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Ya se encuentra instalado el paquete %s, ignorando"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Descartando paquete no comparable %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
-msgstr "No existe instalado otro %s, agregando a la lista para instalación posible"
+msgstr ""
+"No existe instalado otro %s, agregando a la lista para instalación posible"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Opciones de complementos"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Error en la línea de comando: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -425,103 +397,106 @@ msgstr ""
"\n"
"%s: la opción %s necesita un argumento"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color acepta una de las siguientes opciones: auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "muestra este mensaje de ayuda y cierra"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "sea tolerante con los errores"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "se ejecuta completamente a partir del caché, pero no lo actualiza"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "configurar ubicación de archivo"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "tiempo máximo de espera del comando"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "nivel de depuración de la salida"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
-msgstr "muestra duplicados en los repositorios, y en los comandos para mostrar/buscar"
+msgstr ""
+"muestra duplicados en los repositorios, y en los comandos para mostrar/buscar"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "nivel de error de la salida"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "operación discreta"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "operación detallada"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "responde \"si\" a todas las preguntas"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "muestra la versión de Yum y finaliza"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "define la raíz de instalación"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "activa uno o más repositorios (los comodines son permitidos)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "desactiva uno o más repositorios (los comodines son permitidos)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "excluya paquete(s) de acuerdo a su nombre o glob "
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
-msgstr "deshabilita la posibilidad de exclusión desde main, para un repositorio o para todos"
+msgstr ""
+"deshabilita la posibilidad de exclusión desde main, para un repositorio o "
+"para todos"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "habilita el proceso de paquetes obsoletos durante las actualizaciones"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "deshabilita los complementos de Yum"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "deshabilita la verificación de firmas GPG"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "deshabilita complementos de acuerdo a su nombre"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "habilita complementos de acuerdo a su nombre"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "ignora paquetes con problemas de resolución de dependencias"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "controla la utilización de colores"
@@ -794,8 +769,7 @@ msgstr "Actualizando para las dependencias"
msgid "Removing for dependencies"
msgstr "Eliminando para las dependencias"
-#: ../output.py:953
-#: ../output.py:1065
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Ignorando (problemas de dependencias)"
@@ -896,11 +870,13 @@ msgstr "dos"
#, python-format
msgid ""
"\n"
-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds\n"
"to exit.\n"
msgstr ""
"\n"
-" 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:1155
@@ -923,11 +899,11 @@ msgstr "Sistema"
msgid "Bad transaction IDs, or package(s), given"
msgstr "Se ha(n) indicado paquete(s), o IDs de transacciones erróneas"
-#: ../output.py:1284
-#: ../yumcommands.py:1149
-#: ../yum/__init__.py:1067
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
msgid "Warning: RPMDB has been altered since the last yum transaction."
-msgstr "Aviso: Desde la última transacción, han sido modificadas las bases de datos (RPMDB)."
+msgstr ""
+"Aviso: Desde la última transacción, han sido modificadas las bases de datos "
+"(RPMDB)."
#: ../output.py:1289
msgid "No transaction ID given"
@@ -957,8 +933,7 @@ msgstr "ID de transacción :"
msgid "Begin time :"
msgstr "Hora inicial :"
-#: ../output.py:1362
-#: ../output.py:1364
+#: ../output.py:1362 ../output.py:1364
msgid "Begin rpmdb :"
msgstr "Rpmdb inicial :"
@@ -971,8 +946,7 @@ msgstr "(%s segundos)"
msgid "End time :"
msgstr "Hora final : "
-#: ../output.py:1382
-#: ../output.py:1384
+#: ../output.py:1382 ../output.py:1384
msgid "End rpmdb :"
msgstr "Rpmdb final :"
@@ -980,9 +954,7 @@ msgstr "Rpmdb final :"
msgid "User :"
msgstr "Usuario :"
-#: ../output.py:1387
-#: ../output.py:1389
-#: ../output.py:1391
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
msgid "Return-Code :"
msgstr "Codigo-obtenido :"
@@ -1079,14 +1051,15 @@ msgstr "--> Ejecutando prueba de transacción"
#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
-msgstr "--> Reiniciando la resolución de las dependencias con las nuevas modificaciones."
+msgstr ""
+"--> Reiniciando la resolución de las dependencias con las nuevas "
+"modificaciones."
#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Resolución de dependencias finalizada"
-#: ../output.py:1553
-#: ../output.py:1558
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Procesando dependencias: %s para el paquete: %s"
@@ -1096,23 +1069,25 @@ msgstr "--> Procesando dependencias: %s para el paquete: %s"
msgid "--> Unresolved Dependency: %s"
msgstr "--> Dependencia no resuelta: %s"
-#: ../output.py:1568
-#: ../output.py:1573
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Procesando conflictos: %s choca con %s"
#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
-msgstr "--> Construyendo el conjunto de las transacciones con los paquetes seleccionados. Por favor aguarde."
+msgstr ""
+"--> Construyendo el conjunto de las transacciones con los paquetes "
+"seleccionados. Por favor aguarde."
#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
-msgstr "---> Descargando el encabezado de %s para incluirlo en el conjunto de transacciones."
+msgstr ""
+"---> Descargando el encabezado de %s para incluirlo en el conjunto de "
+"transacciones."
-#: ../utils.py:137
-#: ../yummain.py:42
+#: ../utils.py:137 ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1122,8 +1097,7 @@ msgstr ""
"\n"
"Saliendo por cancelación del usuario"
-#: ../utils.py:143
-#: ../yummain.py:48
+#: ../utils.py:143 ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1133,8 +1107,7 @@ msgstr ""
"\n"
"Saliendo por tubería rota"
-#: ../utils.py:145
-#: ../yummain.py:50
+#: ../utils.py:145 ../yummain.py:50
#, python-format
msgid ""
"\n"
@@ -1145,8 +1118,7 @@ msgstr ""
"\n"
"%s"
-#: ../utils.py:184
-#: ../yummain.py:273
+#: ../utils.py:184 ../yummain.py:273
msgid "Complete!"
msgstr "¡Listo!"
@@ -1158,7 +1130,8 @@ msgstr "Necesita ser usuario root para poder ejecutar este comando."
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
-"However, you do not have any GPG public keys installed. You need to download\n"
+"However, you do not have any GPG public keys installed. You need to "
+"download\n"
"the keys for packages you wish to install and install them.\n"
"You can do that by running the command:\n"
" rpm --import public.gpg.key\n"
@@ -1171,8 +1144,10 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
"\n"
-"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso es bueno. \n"
-"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita descargar\n"
+"Usted tiene habilitada la verificación de paquetes mediante llaves GPG. Eso "
+"es bueno. \n"
+"Sin embargo, usted no tiene ninguna llave pública GPG instalada. Necesita "
+"descargar\n"
"e instalar las llaves de todos los paquetes que desee instalar.\n"
"Esto puede hacerlo si ejecuta el comando:\n"
" rpm --import public.gpg.key\n"
@@ -1182,7 +1157,8 @@ msgstr ""
"en la opción 'gpgkey' en la sección del repositorio, y yum \n"
"la instalará por usted.\n"
"\n"
-"Para obtener mayor información, póngase en contacto con su distribución o con su proveedor de paquetes.\n"
+"Para obtener mayor información, póngase en contacto con su distribución o "
+"con su proveedor de paquetes.\n"
#: ../yumcommands.py:69
#, python-format
@@ -1270,9 +1246,7 @@ msgid "Updated Packages"
msgstr "Paquetes actualizados"
#. This only happens in verbose mode
-#: ../yumcommands.py:319
-#: ../yumcommands.py:326
-#: ../yumcommands.py:603
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Convirtiendo paquetes en obsoletos"
@@ -1330,7 +1304,8 @@ msgstr "Creando los archivos de caché para todos los archivos de metadatos."
#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
-msgstr "Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo"
+msgstr ""
+"Esto podría demorar algún tiempo, dependiendo de la velocidad de su equipo"
#: ../yumcommands.py:519
msgid "Metadata Cache Created"
@@ -1400,13 +1375,11 @@ msgstr "Buscando dependencias:"
msgid "Display the configured software repositories"
msgstr "Muestra los repositorios de software configurados"
-#: ../yumcommands.py:810
-#: ../yumcommands.py:811
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "habilitado"
-#: ../yumcommands.py:819
-#: ../yumcommands.py:820
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "deshabilitado"
@@ -1462,8 +1435,7 @@ msgstr " Actualizados : "
msgid "Repo-mirrors : "
msgstr "Repo-mirrors : "
-#: ../yumcommands.py:882
-#: ../yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr "Desconocido"
@@ -1496,14 +1468,11 @@ msgstr "Repo-include : "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:912
-#: ../yumcommands.py:938
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "id del repositorio"
-#: ../yumcommands.py:926
-#: ../yumcommands.py:927
-#: ../yumcommands.py:941
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "estado"
@@ -1642,17 +1611,17 @@ msgid " State : %s, pid: %d"
msgstr " Estado : %s, pid: %d"
#: ../yummain.py:173
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... "
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr ""
+"Otra aplicación tiene retenido el bloqueo de Yum; esperándolo para salir... "
-#: ../yummain.py:201
-#: ../yummain.py:240
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Error: %s"
-#: ../yummain.py:211
-#: ../yummain.py:253
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Error(es) desconocido(s): Código de salida: %d:"
@@ -1664,7 +1633,8 @@ msgstr "Resolviendo dependencias"
#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
-msgstr " Podría intentar utilizar el comando --skip-broken para sortear el problema"
+msgstr ""
+" Podría intentar utilizar el comando --skip-broken para sortear el problema"
#: ../yummain.py:243
msgid ""
@@ -1694,201 +1664,206 @@ msgstr ""
"\n"
"Saliendo por cancelación del usuario."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() desaparecerá en alguna versión posterior de Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
-msgstr "Configurando TransactionSets antes de la activación de clase de configuración"
+msgstr ""
+"Configurando TransactionSets antes de la activación de clase de configuración"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "tsflag no válido en el archivo de configuración: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Buscando pkgSack para la dependencia: %s"
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Posible correspondencia para %s desde %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Se ha encontrado %s para poder solicitar %s"
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Miembro: %s"
-#: ../yum/depsolve.py:239
-#: ../yum/depsolve.py:750
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s convertido para instalar"
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Agregando paquete %s en modo %s"
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Eliminando paquete %s"
-#: ../yum/depsolve.py:278
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s necesita: %s"
-#: ../yum/depsolve.py:336
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "El requerimiento que se necesita ya fue buscado, haciendo trampa"
-#: ../yum/depsolve.py:346
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "El requerimiento necesitado no es un nombre de paquete. Buscando: %s"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Proveedor posible: %s"
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "El modo es %s para el proveedor de %s: %s"
-#: ../yum/depsolve.py:380
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Modo para el paquete que ofrece %s: %s"
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: el paquete %s que necesita %s ha sido marcado para eliminarse"
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
-msgstr "TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la dependencia."
+msgstr ""
+"TSINFO: Transformando a %s en obsoleto utilizando %s para resolver la "
+"dependencia."
-#: ../yum/depsolve.py:400
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Actualizando %s para resolver la dependencia."
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
-msgstr "No es posible encontrar un camino de actualización para la dependencia para: %s"
+msgstr ""
+"No es posible encontrar un camino de actualización para la dependencia para: "
+"%s"
-#: ../yum/depsolve.py:418
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Requerimiento %s irresoluble para %s"
-#: ../yum/depsolve.py:441
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Rápidamente se ha localizado %s al ser requerido por %s"
#. is it already installed?
-#: ../yum/depsolve.py:483
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
-msgstr "%s se encuentra entre los paquetes provistos, pero ya está instalado, eliminando. "
+msgstr ""
+"%s se encuentra entre los paquetes provistos, pero ya está instalado, "
+"eliminando. "
-#: ../yum/depsolve.py:499
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "El paquete de solución posible %s posee una nueva instancia en ts."
-#: ../yum/depsolve.py:510
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
-msgstr "El paquete de solución posible %s posee una nueva instancia ya instalada."
+msgstr ""
+"El paquete de solución posible %s posee una nueva instancia ya instalada."
-#: ../yum/depsolve.py:518
-#: ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
-msgstr "No se encuentra una dependencia: es necesario %s para poder instalar el paquete %s"
+msgstr ""
+"No se encuentra una dependencia: es necesario %s para poder instalar el "
+"paquete %s"
-#: ../yum/depsolve.py:531
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s ya se encuentra en ts, ignorándolo"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Seleccionado %s como actualización de %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Seleccionando %s como una instalación para %s"
-#: ../yum/depsolve.py:686
-#: ../yum/depsolve.py:768
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Exito - transacción vacía"
-#: ../yum/depsolve.py:725
-#: ../yum/depsolve.py:740
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Reiniciando el bucle"
-#: ../yum/depsolve.py:756
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Finalizando el proceso de dependencias"
-#: ../yum/depsolve.py:762
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s desde %s tiene problemas de resolución de dependencias"
-#: ../yum/depsolve.py:769
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Exito - dependencias resueltas"
-#: ../yum/depsolve.py:783
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Verificando dependencias para %s"
-#: ../yum/depsolve.py:866
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "localizando a %s como un requerimiento de %s"
-#: ../yum/depsolve.py:1008
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Ejecutando compare_providers() para %s"
-#: ../yum/depsolve.py:1042
-#: ../yum/depsolve.py:1048
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "mejor arquitectura en po %s"
-#: ../yum/depsolve.py:1143
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s hace obsoleto a %s"
-#: ../yum/depsolve.py:1155
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1897,17 +1872,17 @@ msgstr ""
"archdist comparó %s con %s en %s\n"
" Vencedor: %s"
-#: ../yum/depsolve.py:1162
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "sourcerpm común %s y %s"
-#: ../yum/depsolve.py:1168
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "prefijo común de %s entre %s y %s"
-#: ../yum/depsolve.py:1176
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Mejor orden: %s"
@@ -1919,7 +1894,8 @@ msgstr "doConfigSetup() desaparecerá en alguna versión posterior de Yum.\n"
#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
-msgstr "Al repositorio %r le falta un nombre en su configuración, utilizando el id"
+msgstr ""
+"Al repositorio %r le falta un nombre en su configuración, utilizando el id"
#: ../yum/__init__.py:450
msgid "plugins already initialised"
@@ -1948,7 +1924,9 @@ msgstr "Configurando sacos de paquetes"
#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
-msgstr "el objeto del repositorio para el repositorio %s necesita de un método a _resetSack\n"
+msgstr ""
+"el objeto del repositorio para el repositorio %s necesita de un método a "
+"_resetSack\n"
#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
@@ -1994,8 +1972,12 @@ msgid "The program %s%s%s is found in the yum-utils package."
msgstr "El programa %s%s%s se encuentra en el paquete yum-utils."
#: ../yum/__init__.py:785
-msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
-msgstr "Existen transacciones restantes no finalizadas. Podría considerar primero ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas."
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+"Existen transacciones restantes no finalizadas. Podría considerar primero "
+"ejecutar el comando yum-complete-transaction, de modo de poder finalizarlas."
#: ../yum/__init__.py:853
#, python-format
@@ -2021,8 +2003,11 @@ msgid " %s from %s"
msgstr " %s de %s"
#: ../yum/__init__.py:1083
-msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr "Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la transacción."
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+"Aviso: scriptlet o algún otro tipo de error no fatal ha ocurrido durante la "
+"transacción."
#: ../yum/__init__.py:1101
#, python-format
@@ -2053,7 +2038,8 @@ msgstr "No es posible verificar si se encuentra activo el PID %s"
#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
-msgstr "Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s."
+msgstr ""
+"Bloqueo existente en %s: otra copia se encuentra en ejecución como pid %s."
#. Whoa. What the heck happened?
#: ../yum/__init__.py:1328
@@ -2076,10 +2062,11 @@ msgstr "El paquete no se corresponde con la suma de verificación"
#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
-msgstr "el paquete no ha superado la suma de verificación, pero el caché se encuentra habilitado para %s"
+msgstr ""
+"el paquete no ha superado la suma de verificación, pero el caché se "
+"encuentra habilitado para %s"
-#: ../yum/__init__.py:1436
-#: ../yum/__init__.py:1465
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "utilizando una copia local de %s"
@@ -2101,8 +2088,11 @@ msgstr "El encabezado no está completo."
#: ../yum/__init__.py:1563
#, python-format
-msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
-msgstr "El encabezado no se encuentra en el caché local, y está habilitado el modo de solo cacheo. No es posible descargar %s"
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+msgstr ""
+"El encabezado no se encuentra en el caché local, y está habilitado el modo "
+"de solo cacheo. No es posible descargar %s"
#: ../yum/__init__.py:1618
#, python-format
@@ -2160,8 +2150,12 @@ msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Nada se corresponde con %s.%s %s:%s-%s desde la actualización"
#: ../yum/__init__.py:2026
-msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
-msgstr "searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar utilice searchGenerator(). \n"
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum. Use searchGenerator() instead. \n"
+msgstr ""
+"searchPackages() desaparecerá en alguna versión próxima de Yum. En su lugar "
+"utilice searchGenerator(). \n"
#: ../yum/__init__.py:2065
#, python-format
@@ -2190,19 +2184,14 @@ msgstr "Lo que se ha indicado combina con: %s"
msgid "No group data available for configured repositories"
msgstr "No existen datos de grupo disponibles en los repositorios configurados"
-#: ../yum/__init__.py:2201
-#: ../yum/__init__.py:2220
-#: ../yum/__init__.py:2251
-#: ../yum/__init__.py:2257
-#: ../yum/__init__.py:2336
-#: ../yum/__init__.py:2340
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "No existe un grupo denominado %s"
-#: ../yum/__init__.py:2232
-#: ../yum/__init__.py:2353
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "el paquete %s no fue marcado en el grupo %s"
@@ -2227,13 +2216,11 @@ msgstr "La tupla %s de paquetes no pudo ser encontrada en el saco de paquetes"
msgid "Package tuple %s could not be found in rpmdb"
msgstr "La tupla %s de paquetes no pudo ser encontrada en la base de datos"
-#: ../yum/__init__.py:2455
-#: ../yum/__init__.py:2505
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Marca de versión no válida"
-#: ../yum/__init__.py:2475
-#: ../yum/__init__.py:2480
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "No se ha encontrado ningún paquete para %s"
@@ -2246,15 +2233,12 @@ msgstr "El objeto de paquete no era una instancia de objeto de paquete"
msgid "Nothing specified to install"
msgstr "No se ha indicado nada para instalar"
-#: ../yum/__init__.py:2716
-#: ../yum/__init__.py:3489
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Verificando la provision virtual o provision de archivo de %s"
-#: ../yum/__init__.py:2722
-#: ../yum/__init__.py:3037
-#: ../yum/__init__.py:3205
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
@@ -2282,7 +2266,9 @@ msgstr "El paquete %s se hace obsoleto con %s, que ya se encuentra instalado"
#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "El paquete %s se hace obsoleto con %s, en su lugar se está intentando instalar %s"
+msgstr ""
+"El paquete %s se hace obsoleto con %s, en su lugar se está intentando "
+"instalar %s"
#: ../yum/__init__.py:2850
#, python-format
@@ -2292,23 +2278,22 @@ msgstr "El paquete %s ya se encuentra instalado con su versión más reciente"
#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
-msgstr "El paquete concordante con %s ya se encuentra instalado. Verificando si puede actualizarse."
+msgstr ""
+"El paquete concordante con %s ya se encuentra instalado. Verificando si "
+"puede actualizarse."
#. update everything (the easy case)
#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Actualizando todo"
-#: ../yum/__init__.py:2987
-#: ../yum/__init__.py:3102
-#: ../yum/__init__.py:3129
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3022
-#: ../yum/__init__.py:3202
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
@@ -2323,45 +2308,44 @@ msgstr "El paquete ya es obsoleto: %s.%s %s:%s-%s"
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Dejando sin actualizar el paquete que ya es obsoleto: %s"
-#: ../yum/__init__.py:3133
-#: ../yum/__init__.py:3159
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%s-%s"
+msgstr ""
+"Dejando sin actualizar el paquete que ya se encuentra actualizado: %s.%s %s:%"
+"s-%s"
#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "No hay paquete correspondiente para ser eliminado"
-#: ../yum/__init__.py:3251
-#: ../yum/__init__.py:3349
-#: ../yum/__init__.py:3432
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "No es posible abrir el archivo: %s. Ignorando."
-#: ../yum/__init__.py:3254
-#: ../yum/__init__.py:3352
-#: ../yum/__init__.py:3435
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Examinando %s: %s"
-#: ../yum/__init__.py:3262
-#: ../yum/__init__.py:3355
-#: ../yum/__init__.py:3438
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
-msgstr "No es posible añadir el paquete %s a la transacción. La arquitectura no es compatible: %s"
+msgstr ""
+"No es posible añadir el paquete %s a la transacción. La arquitectura no es "
+"compatible: %s"
#: ../yum/__init__.py:3270
#, python-format
-msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
-msgstr "El paquete %s no está instalado, no puede actualizarse. En su lugar, para instalarlo, ejecute el comando yum install."
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr ""
+"El paquete %s no está instalado, no puede actualizarse. En su lugar, para "
+"instalarlo, ejecute el comando yum install."
-#: ../yum/__init__.py:3299
-#: ../yum/__init__.py:3360
-#: ../yum/__init__.py:3443
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Excluyendo %s"
@@ -2383,10 +2367,10 @@ msgstr "%s: no actualiza el paquete instalado."
#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
-msgstr "Problema al reinstalar: no existe ningún paquete concordante para eliminar"
+msgstr ""
+"Problema al reinstalar: no existe ningún paquete concordante para eliminar"
-#: ../yum/__init__.py:3392
-#: ../yum/__init__.py:3523
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "El paquete %s permite múltiples instalaciones, ignorando"
@@ -2394,7 +2378,9 @@ msgstr "El paquete %s permite múltiples instalaciones, ignorando"
#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
-msgstr "Problema al reinstalar: no existe ningún paquete concordante con %s para instalar"
+msgstr ""
+"Problema al reinstalar: no existe ningún paquete concordante con %s para "
+"instalar"
#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
@@ -2410,8 +2396,7 @@ msgstr "Ninguna correspondencia disponible para el paquete: %s"
msgid "Only Upgrade available on package: %s"
msgstr "Solo existe la posibilidad de actualizar el paquete: %s"
-#: ../yum/__init__.py:3635
-#: ../yum/__init__.py:3672
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
#, python-format
msgid "Failed to downgrade: %s"
msgstr "Falló al desactualizar: %s"
@@ -2436,8 +2421,7 @@ msgid "GPG key at %s (0x%s) is already installed"
msgstr "La llave GPG de %s (0x%s) ya se encuentra instalada"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3772
-#: ../yum/__init__.py:3834
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importando la llave GPG 0x%s \"%s\" desde %s"
@@ -2451,20 +2435,21 @@ msgstr "No se está instalando la llave"
msgid "Key import failed (code %d)"
msgstr "La importación de la llave falló (código %d)"
-#: ../yum/__init__.py:3796
-#: ../yum/__init__.py:3855
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "La llave ha sido importada exitosamente"
-#: ../yum/__init__.py:3801
-#: ../yum/__init__.py:3860
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+"The GPG keys listed for the \"%s\" repository are already installed but they "
+"are not correct for this package.\n"
"Check that the correct key URLs are configured for this repository."
msgstr ""
-"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran instaladas, pero con este paquete no son correctas.\n"
-"Verifique que las URLs de la llave para este repositorio estén correctamente configuradas."
+"Las llaves GPG listadas para el repositorio \"%s\" ya se encuentran "
+"instaladas, pero con este paquete no son correctas.\n"
+"Verifique que las URLs de la llave para este repositorio estén correctamente "
+"configuradas."
#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
@@ -2506,8 +2491,7 @@ msgstr "Errores de la prueba de transacción:"
msgid "Loaded plugins: "
msgstr "Complementos cargados:"
-#: ../yum/plugins.py:216
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr "No hay un complemento que se corresponda con: %s"
@@ -2515,7 +2499,8 @@ msgstr "No hay un complemento que se corresponda con: %s"
#: ../yum/plugins.py:252
#, python-format
msgid "Not loading \"%s\" plugin, as it is disabled"
-msgstr "El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado"
+msgstr ""
+"El complemento \"%s\" no será cargado, puesto que se encuentra deshabilitado"
#. Give full backtrace:
#: ../yum/plugins.py:264
@@ -2540,8 +2525,11 @@ msgstr "Cargando el complemento \"%s\""
#: ../yum/plugins.py:316
#, python-format
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda de complementos "
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+"Existen dos o más complementos con el nombre \"%s\", en la ruta de búsqueda "
+"de complementos "
#: ../yum/plugins.py:336
#, python-format
@@ -2553,7 +2541,8 @@ msgstr "No se encuentra el archivo de configuración %s"
#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
-msgstr "No es posible encontrar el archivo de configuración para el complemento %s"
+msgstr ""
+"No es posible encontrar el archivo de configuración para el complemento %s"
#: ../yum/plugins.py:501
msgid "registration of commands not supported"
@@ -2575,16 +2564,16 @@ msgstr "El RPM %s ha fallado la verificación md5"
#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se encuentre en uso?"
+msgstr ""
+"No es posible abrir la base de datos de RPM para su lectura. ¿Tal vez se "
+"encuentre en uso?"
#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Se obtuvo un encabezado vacío, algo ha salido mal"
-#: ../rpmUtils/oldUtils.py:253
-#: ../rpmUtils/oldUtils.py:260
-#: ../rpmUtils/oldUtils.py:263
-#: ../rpmUtils/oldUtils.py:266
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Encabezado %s dañado"
@@ -2600,4 +2589,3 @@ msgstr "Error al abrir el rpm %s - error %s"
#~ msgstr ""
#~ "getInstalledPackageObject() desaparecerá en alguna versión próxima de "
#~ "Yum, utilice en su lugar self.rpmdb.searchPkgTuple().\n"
-
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 0000000..363f1de
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,2558 @@
+# Finnish translation of yum.
+# Copyright (C) 2009 yum's COPYRIGHT HOLDER
+# This file is distributed under the same license as the yum package.
+# Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: yum\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
+"PO-Revision-Date: 2009-11-11 01:39+0200\n"
+"Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
+"Language-Team: Finnish <laatu@lokalisointi.org>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.4.1\n"
+
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
+msgid "Updating"
+msgstr "Päivitetään"
+
+#: ../callback.py:49 ../yum/rpmtrans.py:72
+msgid "Erasing"
+msgstr "Poistetaan"
+
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
+msgid "Installing"
+msgstr "Asennetaan"
+
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
+msgid "Obsoleted"
+msgstr "Vanhennettu"
+
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
+msgid "Updated"
+msgstr "Päivitetty"
+
+#: ../callback.py:55 ../output.py:1399
+msgid "Erased"
+msgstr "Poistettu"
+
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
+msgid "Installed"
+msgstr "Asennettu"
+
+#: ../callback.py:130
+msgid "No header - huh?"
+msgstr "Ei otsaketta – häh?"
+
+#: ../callback.py:168
+msgid "Repackage"
+msgstr "Uudelleenpaketoi"
+
+#: ../callback.py:189
+#, python-format
+msgid "Error: invalid output state: %s for %s"
+msgstr "Virhe: virheellinen tulostetila: %s, paketti %s"
+
+#: ../callback.py:212
+#, python-format
+msgid "Erased: %s"
+msgstr "Poistettiin: %s"
+
+#: ../callback.py:217 ../output.py:941
+msgid "Removing"
+msgstr "Poistetaan"
+
+#: ../callback.py:219 ../yum/rpmtrans.py:77
+msgid "Cleanup"
+msgstr "Siivotaan"
+
+#: ../cli.py:106
+#, python-format
+msgid "Command \"%s\" already defined"
+msgstr "Komento ”%s” on jo määritelty"
+
+#: ../cli.py:118
+msgid "Setting up repositories"
+msgstr "Tehdään asennuslähdeasetuksia"
+
+#: ../cli.py:129
+msgid "Reading repository metadata in from local files"
+msgstr "Luetaan asennuslähteiden metadataa paikallisista tiedostoista"
+
+#: ../cli.py:192 ../utils.py:107
+#, python-format
+msgid "Config Error: %s"
+msgstr "Asetusvirhe: %s"
+
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
+#, python-format
+msgid "Options Error: %s"
+msgstr "Valitsinvirhe: %s"
+
+#: ../cli.py:223
+#, python-format
+msgid " Installed: %s-%s at %s"
+msgstr " Asennettiin : %s-%s ajassa %s"
+
+#: ../cli.py:225
+#, python-format
+msgid " Built : %s at %s"
+msgstr " Käännettiin : %s ajassa %s"
+
+# mitä on "commit" suomeksi?
+#: ../cli.py:227
+#, python-format
+msgid " Committed: %s at %s"
+msgstr " Suoritettiin: %s ajassa %s"
+
+#: ../cli.py:266
+msgid "You need to give some command"
+msgstr "Jokin komento on annettava"
+
+#: ../cli.py:309
+msgid "Disk Requirements:\n"
+msgstr "Vaadittu levytila:\n"
+
+#: ../cli.py:311
+#, python-format
+msgid " At least %dMB needed on the %s filesystem.\n"
+msgstr " Vähintään %d Mt levytilaa tarvitaan tiedostojärjestelmällä %s.\n"
+
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
+#: ../cli.py:316
+msgid ""
+"Error Summary\n"
+"-------------\n"
+msgstr ""
+"Yhteenveto virheistä\n"
+"--------------------\n"
+
+#: ../cli.py:359
+msgid "Trying to run the transaction but nothing to do. Exiting."
+msgstr ""
+"Yritettiin suorittaa transaktio, mutta ei ole mitään tehtävää. Lopetetaan."
+
+#: ../cli.py:395
+msgid "Exiting on user Command"
+msgstr "Lopetetaan, käyttäjä antoi lopetuskomennon"
+
+#: ../cli.py:399
+msgid "Downloading Packages:"
+msgstr "Ladataan paketteja:"
+
+#: ../cli.py:404
+msgid "Error Downloading Packages:\n"
+msgstr "Virhe pakettien latauksessa:\n"
+
+#: ../cli.py:418 ../yum/__init__.py:4014
+msgid "Running rpm_check_debug"
+msgstr "Suoritetaan rpm_check_debug"
+
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr "VIRHE RPM on päivitettävä, jotta se osaa käsitellä:"
+
+#: ../cli.py:429 ../yum/__init__.py:4026
+msgid "ERROR with rpm_check_debug vs depsolve:"
+msgstr "VIRHE rpm_check_debugin ja riippuvuuksien tarkistuksen välillä:"
+
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr "RPM on päivitettävä"
+
+#: ../cli.py:436
+#, python-format
+msgid "Please report this error in %s"
+msgstr "Ilmoita tästä ongelmasta osoitteeseen %s"
+
+#: ../cli.py:442
+msgid "Running Transaction Test"
+msgstr "Suoritetaan transaktiotestiä"
+
+#: ../cli.py:458
+msgid "Finished Transaction Test"
+msgstr "Transaktiotesti valmistui"
+
+#: ../cli.py:460
+msgid "Transaction Check Error:\n"
+msgstr "Transaktiotarkistuksen virhe:\n"
+
+#: ../cli.py:467
+msgid "Transaction Test Succeeded"
+msgstr "Transaktiotesti onnistui"
+
+#: ../cli.py:489
+msgid "Running Transaction"
+msgstr "Suoritetaan transaktiota"
+
+#: ../cli.py:519
+msgid ""
+"Refusing to automatically import keys when running unattended.\n"
+"Use \"-y\" to override."
+msgstr ""
+"Avaimia ei tuoda automaattisesti, kun yumia suoritetaan ilman valvontaa.\n"
+"Käytä valitsinta ”-y” tämän muuttamiseksi."
+
+#: ../cli.py:538 ../cli.py:572
+msgid " * Maybe you meant: "
+msgstr " * Tarkoititko: "
+
+#: ../cli.py:555 ../cli.py:563
+#, python-format
+msgid "Package(s) %s%s%s available, but not installed."
+msgstr ""
+"Paketti tai paketit %s%s%s ovat saatavilla, mutta niitä ei ole asennettu."
+
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
+#, python-format
+msgid "No package %s%s%s available."
+msgstr "Pakettia %s%s%s ei ole saatavilla."
+
+#: ../cli.py:605 ../cli.py:738
+msgid "Package(s) to install"
+msgstr "Asennettavat paketit"
+
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
+msgid "Nothing to do"
+msgstr "Ei mitään tehtävää"
+
+#: ../cli.py:639
+#, python-format
+msgid "%d packages marked for Update"
+msgstr "%d pakettia merkitty päivitettäväksi"
+
+#: ../cli.py:642
+msgid "No Packages marked for Update"
+msgstr "Yhtään pakettia ei ole merkitty päivitettäväksi"
+
+#: ../cli.py:656
+#, python-format
+msgid "%d packages marked for removal"
+msgstr "%d pakettia merkitty poistettavaksi"
+
+#: ../cli.py:659
+msgid "No Packages marked for removal"
+msgstr "Yhtään pakettia ei ole merkitty poistettavaksi"
+
+#: ../cli.py:683
+msgid "Package(s) to downgrade"
+msgstr "Vanhennettavat paketit"
+
+#: ../cli.py:707
+#, python-format
+msgid " (from %s)"
+msgstr " (versiosta %s)"
+
+#: ../cli.py:709
+#, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Asennettua pakettia %s%s%s%s ei ole saatavilla."
+
+#: ../cli.py:716
+msgid "Package(s) to reinstall"
+msgstr "Uudelleenasennettavat paketit"
+
+#: ../cli.py:729
+msgid "No Packages Provided"
+msgstr "Yhtään pakettia ei annettu"
+
+#: ../cli.py:813
+#, python-format
+msgid "Warning: No matches found for: %s"
+msgstr "Varoitus: hakutuloksia ei löytynyt hakusanalle %s"
+
+#: ../cli.py:816
+msgid "No Matches found"
+msgstr "Hakutuloksia ei löytynyt"
+
+#: ../cli.py:855
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+"Varoitus: Yumin 3.0.x-versiot tuottivat virheellisesti hakutuloksia\n"
+"tiedostonimistä.\n"
+" Hakusanoilla ”%s*/%s%s” ja/tai ”%s*bin/%s%s” saadaan niitä vastaava "
+"toiminta."
+
+#: ../cli.py:871
+#, python-format
+msgid "No Package Found for %s"
+msgstr "Hakusanalla %s ei löytynyt pakettia"
+
+#: ../cli.py:883
+msgid "Cleaning up Everything"
+msgstr "Siivotaan kaikki"
+
+#: ../cli.py:897
+msgid "Cleaning up Headers"
+msgstr "Siivotaan otsakkeet"
+
+#: ../cli.py:900
+msgid "Cleaning up Packages"
+msgstr "Siivotaan paketit"
+
+#: ../cli.py:903
+msgid "Cleaning up xml metadata"
+msgstr "Siivotaan XML-metadata"
+
+#: ../cli.py:906
+msgid "Cleaning up database cache"
+msgstr "Siivotaan tiedokannan välimuisti"
+
+#: ../cli.py:909
+msgid "Cleaning up expire-cache metadata"
+msgstr "Siivotaan välimuistin vanhentumiseen liittyvä metadata"
+
+#: ../cli.py:912
+msgid "Cleaning up plugins"
+msgstr "Siivotaan liitännäiset"
+
+#: ../cli.py:937
+msgid "Installed Groups:"
+msgstr "Asennetut ryhmät:"
+
+#: ../cli.py:949
+msgid "Available Groups:"
+msgstr "Saatavilla olevat ryhmät:"
+
+#: ../cli.py:959
+msgid "Done"
+msgstr "Valmis"
+
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
+#, python-format
+msgid "Warning: Group %s does not exist."
+msgstr "Varoitus: Ryhmää %s ei ole olemassa."
+
+#: ../cli.py:998
+msgid "No packages in any requested group available to install or update"
+msgstr ""
+"Missään pyydetyssä ryhmässä ei ole yhtään asennettavaa tai päivitettävää "
+"pakettia"
+
+#: ../cli.py:1000
+#, python-format
+msgid "%d Package(s) to Install"
+msgstr "%d pakettia asennettavana"
+
+#: ../cli.py:1010 ../yum/__init__.py:2641
+#, python-format
+msgid "No group named %s exists"
+msgstr "Ryhmää nimeltä %s ei ole olemassa"
+
+#: ../cli.py:1016
+msgid "No packages to remove from groups"
+msgstr "Ei yhtään poistettavaa pakettia ryhmien perusteella"
+
+#: ../cli.py:1018
+#, python-format
+msgid "%d Package(s) to remove"
+msgstr "%d poistettavaa pakettia"
+
+#: ../cli.py:1060
+#, python-format
+msgid "Package %s is already installed, skipping"
+msgstr "Paketti %s on jo asennettu, ohitetaan"
+
+#: ../cli.py:1071
+#, python-format
+msgid "Discarding non-comparable pkg %s.%s"
+msgstr "Hylätään paketti %s.%s, jota ei voi verrata"
+
+#. we've not got any installed that match n or n+a
+#: ../cli.py:1097
+#, python-format
+msgid "No other %s installed, adding to list for potential install"
+msgstr ""
+"Toista pakettia nimeltä %s ei ole asennettuna, lisätään mahdollisesti "
+"asennettavien luetteloon"
+
+#: ../cli.py:1117
+msgid "Plugin Options"
+msgstr "Liitännäisten valitsimet"
+
+#: ../cli.py:1125
+#, python-format
+msgid "Command line error: %s"
+msgstr "Komentorivivirhe: %s"
+
+#: ../cli.py:1138
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+"\n"
+"\n"
+"%s: valitsin %s vaatii argumentin"
+
+#: ../cli.py:1191
+msgid "--color takes one of: auto, always, never"
+msgstr "--color vaatii yhden seuraavista argumenteista: auto, always, never"
+
+#: ../cli.py:1298
+msgid "show this help message and exit"
+msgstr "näytä tämä ohjeviesti ja lopeta"
+
+#: ../cli.py:1302
+msgid "be tolerant of errors"
+msgstr "hyväksy virheet"
+
+#: ../cli.py:1304
+msgid "run entirely from cache, don't update cache"
+msgstr "toimi kokonaan välimuistista, älä päivitä sitä"
+
+#: ../cli.py:1306
+msgid "config file location"
+msgstr "asetustiedoston sijainti"
+
+#: ../cli.py:1308
+msgid "maximum command wait time"
+msgstr "komennon suurin odotusaika"
+
+#: ../cli.py:1310
+msgid "debugging output level"
+msgstr "virheenjäljitystulosteiden taso"
+
+#: ../cli.py:1314
+msgid "show duplicates, in repos, in list/search commands"
+msgstr "näytä duplikaatit asennuslähteissä ja list/search-komennoissa"
+
+#: ../cli.py:1316
+msgid "error output level"
+msgstr "virhetulostustaso"
+
+#: ../cli.py:1319
+msgid "quiet operation"
+msgstr "hiljainen toiminta"
+
+#: ../cli.py:1321
+msgid "verbose operation"
+msgstr "yksityiskohtaset tulosteet"
+
+#: ../cli.py:1323
+msgid "answer yes for all questions"
+msgstr "vastaa kyllä kaikkiin kysymyksiin"
+
+#: ../cli.py:1325
+msgid "show Yum version and exit"
+msgstr "näytä Yumin versio ja lopeta"
+
+#: ../cli.py:1326
+msgid "set install root"
+msgstr "aseta asennusjuuri"
+
+#: ../cli.py:1330
+msgid "enable one or more repositories (wildcards allowed)"
+msgstr ""
+"ota käyttöön yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)"
+
+#: ../cli.py:1334
+msgid "disable one or more repositories (wildcards allowed)"
+msgstr ""
+"poista käytöstä yksi tai usempi asennuslähde (jokerimerkit ovat sallittuja)"
+
+#: ../cli.py:1337
+msgid "exclude package(s) by name or glob"
+msgstr "jätä pois paketteja nimen tai jokerimerkkien perusteella"
+
+#: ../cli.py:1339
+msgid "disable exclude from main, for a repo or for everything"
+msgstr ""
+"ota pakettien pois jättäminen pois käytöstä pääasetuksille, jollekin "
+"asennuslähteelle tai kaikelle"
+
+#: ../cli.py:1342
+msgid "enable obsoletes processing during updates"
+msgstr "ota käyttöön vanhentuneiden pakettien käsittely päivitysten aikana"
+
+#: ../cli.py:1344
+msgid "disable Yum plugins"
+msgstr "poista Yumin liitännäiset käytöstä"
+
+#: ../cli.py:1346
+msgid "disable gpg signature checking"
+msgstr "poista GPG-allekirjoitusten tarkistus käytöstä"
+
+#: ../cli.py:1348
+msgid "disable plugins by name"
+msgstr "poista liitännäisiä käytöstä nimen perusteella"
+
+#: ../cli.py:1351
+msgid "enable plugins by name"
+msgstr "ota liitännäisiä käyttöön nimen perusteella"
+
+#: ../cli.py:1354
+msgid "skip packages with depsolving problems"
+msgstr "ohita paketit, joilla on riippuvuusongelmia"
+
+#: ../cli.py:1356
+msgid "control whether color is used"
+msgstr "käytetäänkö värejä"
+
+#: ../output.py:305
+msgid "Jan"
+msgstr "tammi"
+
+#: ../output.py:305
+msgid "Feb"
+msgstr "helmi"
+
+#: ../output.py:305
+msgid "Mar"
+msgstr "maalis"
+
+#: ../output.py:305
+msgid "Apr"
+msgstr "huhti"
+
+#: ../output.py:305
+msgid "May"
+msgstr "touko"
+
+#: ../output.py:305
+msgid "Jun"
+msgstr "kesä"
+
+#: ../output.py:306
+msgid "Jul"
+msgstr "heinä"
+
+#: ../output.py:306
+msgid "Aug"
+msgstr "elo"
+
+#: ../output.py:306
+msgid "Sep"
+msgstr "syys"
+
+#: ../output.py:306
+msgid "Oct"
+msgstr "loka"
+
+#: ../output.py:306
+msgid "Nov"
+msgstr "marras"
+
+#: ../output.py:306
+msgid "Dec"
+msgstr "joulu"
+
+#: ../output.py:316
+msgid "Trying other mirror."
+msgstr "Kokeillaan toista peilipalvelinta."
+
+#: ../output.py:538
+#, python-format
+msgid "Name : %s%s%s"
+msgstr "Nimi : %s%s%s"
+
+#: ../output.py:539
+#, python-format
+msgid "Arch : %s"
+msgstr "Arkkitehtuuri : %s"
+
+#: ../output.py:541
+#, python-format
+msgid "Epoch : %s"
+msgstr "Epoch : %s"
+
+#: ../output.py:542
+#, python-format
+msgid "Version : %s"
+msgstr "Versio : %s"
+
+#: ../output.py:543
+#, python-format
+msgid "Release : %s"
+msgstr "Julkaisu : %s"
+
+#: ../output.py:544
+#, python-format
+msgid "Size : %s"
+msgstr "Koko : %s"
+
+#: ../output.py:545
+#, python-format
+msgid "Repo : %s"
+msgstr "Asennuslähde : %s"
+
+#: ../output.py:547
+#, python-format
+msgid "From repo : %s"
+msgstr "Asennuslähteestä: %s"
+
+#: ../output.py:549
+#, python-format
+msgid "Committer : %s"
+msgstr "Tekijä : %s"
+
+#: ../output.py:550
+#, python-format
+msgid "Committime : %s"
+msgstr "Tekoaika : %s"
+
+#: ../output.py:551
+#, python-format
+msgid "Buildtime : %s"
+msgstr "Käännösaika : %s"
+
+#: ../output.py:553
+#, python-format
+msgid "Installtime: %s"
+msgstr "Asennusaika : %s"
+
+#: ../output.py:554
+msgid "Summary : "
+msgstr "Yhteenveto : "
+
+#: ../output.py:556
+#, python-format
+msgid "URL : %s"
+msgstr "URL : %s"
+
+#: ../output.py:557
+#, python-format
+msgid "License : %s"
+msgstr "Lisenssi : %s"
+
+#: ../output.py:558
+msgid "Description: "
+msgstr "Kuvaus: "
+
+#: ../output.py:626
+msgid "y"
+msgstr "k"
+
+#: ../output.py:626
+msgid "yes"
+msgstr "kyllä"
+
+#: ../output.py:627
+msgid "n"
+msgstr "e"
+
+#: ../output.py:627
+msgid "no"
+msgstr "ei"
+
+#: ../output.py:631
+msgid "Is this ok [y/N]: "
+msgstr "Onko tämä ok [k/E]: "
+
+#: ../output.py:722
+#, python-format
+msgid ""
+"\n"
+"Group: %s"
+msgstr ""
+"\n"
+"Ryhmä: %s"
+
+#: ../output.py:726
+#, python-format
+msgid " Group-Id: %s"
+msgstr " Ryhmätunnus: %s"
+
+#: ../output.py:731
+#, python-format
+msgid " Description: %s"
+msgstr " Kuvaus: %s"
+
+#: ../output.py:733
+msgid " Mandatory Packages:"
+msgstr " Pakolliset paketit:"
+
+#: ../output.py:734
+msgid " Default Packages:"
+msgstr " Oletuspaketit:"
+
+#: ../output.py:735
+msgid " Optional Packages:"
+msgstr " Valinnaiset paketit:"
+
+#: ../output.py:736
+msgid " Conditional Packages:"
+msgstr " Ehdolliset paketit:"
+
+#: ../output.py:756
+#, python-format
+msgid "package: %s"
+msgstr "paketti: %s"
+
+#: ../output.py:758
+msgid " No dependencies for this package"
+msgstr " Tällä paketilla ei ole riippuvuuksia"
+
+#: ../output.py:763
+#, python-format
+msgid " dependency: %s"
+msgstr " riippuvuus: %s"
+
+#: ../output.py:765
+msgid " Unsatisfied dependency"
+msgstr " Toteutumaton riippuvuus"
+
+#: ../output.py:837
+#, python-format
+msgid "Repo : %s"
+msgstr "Asennuslähde: %s"
+
+#: ../output.py:838
+msgid "Matched from:"
+msgstr "Vastaavuus :"
+
+#: ../output.py:847
+msgid "Description : "
+msgstr "Kuvaus : "
+
+#: ../output.py:850
+#, python-format
+msgid "URL : %s"
+msgstr "URL : %s"
+
+#: ../output.py:853
+#, python-format
+msgid "License : %s"
+msgstr "Lisenssi : %s"
+
+#: ../output.py:856
+#, python-format
+msgid "Filename : %s"
+msgstr "Tiedostonimi: %s"
+
+#: ../output.py:860
+msgid "Other : "
+msgstr "Muuta : "
+
+#: ../output.py:893
+msgid "There was an error calculating total download size"
+msgstr "Kokonaislatausmäärää laskettaessa tapahtui virhe"
+
+#: ../output.py:898
+#, python-format
+msgid "Total size: %s"
+msgstr "Koko yhteensä: %s"
+
+#: ../output.py:901
+#, python-format
+msgid "Total download size: %s"
+msgstr "Latausmäärä yhteensä: %s"
+
+#: ../output.py:942
+msgid "Reinstalling"
+msgstr "Asennetaan uudelleen"
+
+#: ../output.py:943
+msgid "Downgrading"
+msgstr "Varhennetaan"
+
+#: ../output.py:944
+msgid "Installing for dependencies"
+msgstr "Asennetaan riippuvuuksien vuoksi"
+
+#: ../output.py:945
+msgid "Updating for dependencies"
+msgstr "Päivitetään riippuvuuksien vuoksi"
+
+#: ../output.py:946
+msgid "Removing for dependencies"
+msgstr "Poistetaan riippuvuuksien vuoksi"
+
+#: ../output.py:953 ../output.py:1065
+msgid "Skipped (dependency problems)"
+msgstr "Ohitettiin (riippuvuusongelmia)"
+
+#: ../output.py:976
+msgid "Package"
+msgstr "Paketti"
+
+#: ../output.py:976
+msgid "Arch"
+msgstr "Arkkitehtuuri"
+
+#: ../output.py:977
+msgid "Version"
+msgstr "Versio"
+
+#: ../output.py:977
+msgid "Repository"
+msgstr "Asennuslähde"
+
+#: ../output.py:978
+msgid "Size"
+msgstr "Koko"
+
+#: ../output.py:990
+#, python-format
+msgid ""
+" replacing %s%s%s.%s %s\n"
+"\n"
+msgstr ""
+" korvaa %s%s%s.%s %s\n"
+"\n"
+
+#: ../output.py:999
+#, python-format
+msgid ""
+"\n"
+"Transaction Summary\n"
+"%s\n"
+msgstr ""
+"\n"
+"Transaktion yhteenveto\n"
+"%s\n"
+
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+"Asennetaan %5.5s paketti(a)\n"
+"Päivitetään %5.5s paketti(a)\n"
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+"Poistetaan %5.5s paketti(a)\n"
+"Asennetaan uudelleen %5.5s paketti(a)\n"
+"Varhennetaan %5.5s paketti(a)\n"
+
+#: ../output.py:1059
+msgid "Removed"
+msgstr "Poistettu"
+
+#: ../output.py:1060
+msgid "Dependency Removed"
+msgstr "Poistettu riippuvuuksia"
+
+#: ../output.py:1062
+msgid "Dependency Installed"
+msgstr "Asennettu riippuvuuksia"
+
+#: ../output.py:1064
+msgid "Dependency Updated"
+msgstr "Päivitetty riippuvuuksia"
+
+#: ../output.py:1066
+msgid "Replaced"
+msgstr "Korvattu"
+
+#: ../output.py:1067
+msgid "Failed"
+msgstr "Epäonnistui"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1133
+msgid "two"
+msgstr "kahden"
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
+#, python-format
+msgid ""
+"\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds\n"
+"to exit.\n"
+msgstr ""
+"\n"
+" Nykyinen lataus peruttiin, %skeskeytä (ctrl-c) uudelleen%s %s%s%s sekunnin "
+"aikana\n"
+"ohjelman lopettamiseksi.\n"
+
+#: ../output.py:1155
+msgid "user interrupt"
+msgstr "käyttäjä keskeytti"
+
+#: ../output.py:1173
+msgid "Total"
+msgstr "Yhteensä"
+
+#: ../output.py:1203
+msgid "<unset>"
+msgstr "<ei asetettu>"
+
+#: ../output.py:1204
+msgid "System"
+msgstr "Järjestelmä"
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr "Annettu virheellinen transaktiotunnus tai paketit"
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+"Varoitus: RPM-tietokantaa on muutettu edellisen yum-transaktion jälkeen."
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr "Transaktiotunnusta ei annettu"
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr "Annettiin virheellinen transaktiotunnus"
+
+#: ../output.py:1302
+msgid "Not found given transaction ID"
+msgstr "Annettua transaktiotunnusta ei löytynyt"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr "Löytyi useampi kuin yksi transaktiotunnus!"
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr "Transaktiotunnusta tai pakettia ei annettu"
+
+#: ../output.py:1357
+msgid "Transaction ID :"
+msgstr "Transaktiotunnus :"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr "Aloitusaika :"
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr "RPM-tietokanta alussa :"
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr "(%s sekuntia)"
+
+#: ../output.py:1379
+msgid "End time :"
+msgstr "Lopetusaika :"
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr "RPM-tietokanta lopussa:"
+
+#: ../output.py:1385
+msgid "User :"
+msgstr "Käyttäjä :"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr "Lopetuskoodi :"
+
+#: ../output.py:1387
+msgid "Aborted"
+msgstr "Keskeytetty"
+
+#: ../output.py:1389
+msgid "Failure:"
+msgstr "Epäonnistui:"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr "Onnistui"
+
+#: ../output.py:1392
+msgid "Transaction performed with:"
+msgstr "Transaktio suoritettiin:"
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr "Varhennettu"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr "Omituinen"
+
+#: ../output.py:1409
+msgid "Packages Altered:"
+msgstr "Muutetut paketit:"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr "Sovelman tuloste:"
+
+#: ../output.py:1418
+msgid "Errors:"
+msgstr "Virheet:"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr "Eilen"
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr "Viime viikolla"
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr "Viimeisen kahden viikon aikana"
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr "Viimeisen kolmen kuukauden aikana"
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr "Viimeisen kuuden kuukauden aikana"
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr "Viime vuonna"
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr "Yli vuosi sitten"
+
+#: ../output.py:1524
+msgid "installed"
+msgstr "asennettavaksi"
+
+#: ../output.py:1525
+msgid "updated"
+msgstr "päivitettäväksi"
+
+#: ../output.py:1526
+msgid "obsoleted"
+msgstr "vanhennettavaksi"
+
+#: ../output.py:1527
+msgid "erased"
+msgstr "poistettavaksi"
+
+#: ../output.py:1531
+#, python-format
+msgid "---> Package %s.%s %s:%s-%s set to be %s"
+msgstr "---> Paketti %s.%s %s:%s-%s asetettu %s"
+
+#: ../output.py:1538
+msgid "--> Running transaction check"
+msgstr "--> Suoritetaan transaktiotarkistusta"
+
+#: ../output.py:1543
+msgid "--> Restarting Dependency Resolution with new changes."
+msgstr ""
+"--> Aloitetaan riippuvuuksien tarkistus uudelleen uusien muutosten kanssa."
+
+#: ../output.py:1548
+msgid "--> Finished Dependency Resolution"
+msgstr "--> Riippuvuuksien tarkistus valmistui"
+
+#: ../output.py:1553 ../output.py:1558
+#, python-format
+msgid "--> Processing Dependency: %s for package: %s"
+msgstr "--> Käsitellään riipuvuutta: %s paketille: %s"
+
+#: ../output.py:1562
+#, python-format
+msgid "--> Unresolved Dependency: %s"
+msgstr "--> Ratkaisematon riippuvuus: %s"
+
+#: ../output.py:1568 ../output.py:1573
+#, python-format
+msgid "--> Processing Conflict: %s conflicts %s"
+msgstr "--> Käsitellään ristiriitaa: %s on ristiriidassa paketin %s kanssa"
+
+#: ../output.py:1577
+msgid "--> Populating transaction set with selected packages. Please wait."
+msgstr "--> Täytetään transaktiojoukkoa valituilla paketeilla. Odota hetki."
+
+#: ../output.py:1581
+#, python-format
+msgid "---> Downloading header for %s to pack into transaction set."
+msgstr "---> Ladataan paketin %s otsaketta transaktiojoukkoon lisäämseksi."
+
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Lopetetaan käyttäjän peruttua"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Lopetetaan putken katkettua"
+
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Valmis!"
+
+#: ../yumcommands.py:42
+msgid "You need to be root to perform this command."
+msgstr "Vain pääkäyttäjä voi suorittaa tämän komennon."
+
+#: ../yumcommands.py:49
+msgid ""
+"\n"
+"You have enabled checking of packages via GPG keys. This is a good thing. \n"
+"However, you do not have any GPG public keys installed. You need to "
+"download\n"
+"the keys for packages you wish to install and install them.\n"
+"You can do that by running the command:\n"
+" rpm --import public.gpg.key\n"
+"\n"
+"\n"
+"Alternatively you can specify the url to the key you would like to use\n"
+"for a repository in the 'gpgkey' option in a repository section and yum \n"
+"will install it for you.\n"
+"\n"
+"For more information contact your distribution or package provider.\n"
+msgstr ""
+"\n"
+"Pakettien tarkistaminen GPG-avainten avulla on käytössä, se on hyvä.\n"
+"Yhtään GPG-avainta ei kuitenkaan ole asennettuna. Asennettavaksi aiottuja\n"
+"paketteja varten on ladattava ja asennettava GPG-avaimet.\n"
+"Avaimet voi asentaa suorittamalla komennon:\n"
+" rpm --import julkinen.gpg.avain\n"
+"\n"
+"\n"
+"Käytettävän avaimen URL:n voi määritellä asennuslähteen asetusten\n"
+"”gpgkey”-valitsimella. Tällöin yum asentaa avaimen automaattisesti.\n"
+"\n"
+"Lisätietoja saattaa olla jakelun tai pakettien tarjoajan ohjeissa.\n"
+
+#: ../yumcommands.py:69
+#, python-format
+msgid "Error: Need to pass a list of pkgs to %s"
+msgstr "Virhe: komennolle %s on annettava luettelo paketeista"
+
+#: ../yumcommands.py:75
+msgid "Error: Need an item to match"
+msgstr "Virhe: Tarvitaan vastaava kohta"
+
+#: ../yumcommands.py:81
+msgid "Error: Need a group or list of groups"
+msgstr "Virhe: Tarvitaan ryhmä tai ryhmäluettelo"
+
+#: ../yumcommands.py:90
+#, python-format
+msgid "Error: clean requires an option: %s"
+msgstr "Virhe: clean vaatii valitsimen: %s"
+
+#: ../yumcommands.py:95
+#, python-format
+msgid "Error: invalid clean argument: %r"
+msgstr "Virhe: virheellinen clean-argumentti: %r"
+
+#: ../yumcommands.py:108
+msgid "No argument to shell"
+msgstr "shellille ei annettu argumenttia"
+
+#: ../yumcommands.py:110
+#, python-format
+msgid "Filename passed to shell: %s"
+msgstr "Tiedostonimi välitettiin shellille: %s"
+
+#: ../yumcommands.py:114
+#, python-format
+msgid "File %s given as argument to shell does not exist."
+msgstr ""
+"Tiedosto %s annettiin argumenttina shellille, mutta sitä ei ole olemassa."
+
+#: ../yumcommands.py:120
+msgid "Error: more than one file given as argument to shell."
+msgstr "Virhe: useampi kuin yksi tiedosto annettiin argumenttina shellille."
+
+#: ../yumcommands.py:169
+msgid "PACKAGE..."
+msgstr "PAKETTI..."
+
+#: ../yumcommands.py:172
+msgid "Install a package or packages on your system"
+msgstr "Asenna paketti tai paketteja järjestelmään"
+
+#: ../yumcommands.py:180
+msgid "Setting up Install Process"
+msgstr "Aloitetaan asennusprosessi"
+
+#: ../yumcommands.py:191
+msgid "[PACKAGE...]"
+msgstr "[PAKETTI...]"
+
+#: ../yumcommands.py:194
+msgid "Update a package or packages on your system"
+msgstr "Päivitä paketti tai paketteja järjestelmään"
+
+#: ../yumcommands.py:201
+msgid "Setting up Update Process"
+msgstr "Aloitetaan päivitysprosessi"
+
+#: ../yumcommands.py:246
+msgid "Display details about a package or group of packages"
+msgstr "Näytä tietoja paketista tai pakettiryhmästä"
+
+#: ../yumcommands.py:295
+msgid "Installed Packages"
+msgstr "Asennetut paketit"
+
+#: ../yumcommands.py:303
+msgid "Available Packages"
+msgstr "Saatavilla olevat paketit"
+
+#: ../yumcommands.py:307
+msgid "Extra Packages"
+msgstr "Lisäpaketit"
+
+#: ../yumcommands.py:311
+msgid "Updated Packages"
+msgstr "Päivitetyt paketit"
+
+#. This only happens in verbose mode
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
+msgid "Obsoleting Packages"
+msgstr "Vanhentavat paketit"
+
+#: ../yumcommands.py:328
+msgid "Recently Added Packages"
+msgstr "Äskettäin lisätyt paketit"
+
+#: ../yumcommands.py:335
+msgid "No matching Packages to list"
+msgstr "Ei yhtään vastaavaa pakettia lueteltavaksi"
+
+#: ../yumcommands.py:349
+msgid "List a package or groups of packages"
+msgstr "Luettele paketti tai pakettiryhmä"
+
+#: ../yumcommands.py:361
+msgid "Remove a package or packages from your system"
+msgstr "Poista paketti tai paketteja järjestelmästä"
+
+#: ../yumcommands.py:368
+msgid "Setting up Remove Process"
+msgstr "Aloitetaan poistoprosessi"
+
+#: ../yumcommands.py:382
+msgid "Setting up Group Process"
+msgstr "Aloitetaan ryhmäprosessi"
+
+#: ../yumcommands.py:388
+msgid "No Groups on which to run command"
+msgstr "Ei ryhmiä joille suorittaa komentoa"
+
+#: ../yumcommands.py:401
+msgid "List available package groups"
+msgstr "Luettele saatavilla olevat pakettiryhmät"
+
+#: ../yumcommands.py:418
+msgid "Install the packages in a group on your system"
+msgstr "Asenna ryhmään kuuluvat paketit järjestelmään"
+
+#: ../yumcommands.py:440
+msgid "Remove the packages in a group from your system"
+msgstr "Poista ryhmään kuuluvat paketit järjestelmästä"
+
+#: ../yumcommands.py:467
+msgid "Display details about a package group"
+msgstr "Näytä tietoja pakettiryhmästä"
+
+#: ../yumcommands.py:491
+msgid "Generate the metadata cache"
+msgstr "Luo metadatavälimuisti"
+
+#: ../yumcommands.py:497
+msgid "Making cache files for all metadata files."
+msgstr "Luodaan välimuistitiedostoja kaikille metadatatiedostoille"
+
+#: ../yumcommands.py:498
+msgid "This may take a while depending on the speed of this computer"
+msgstr "Tämä voi kestää jonkin aikaa riippuen tietokoneen nopeudesta"
+
+#: ../yumcommands.py:519
+msgid "Metadata Cache Created"
+msgstr "Metadatavälimuisti on luotu"
+
+#: ../yumcommands.py:533
+msgid "Remove cached data"
+msgstr "Poista välimuistissa oleva data"
+
+#: ../yumcommands.py:553
+msgid "Find what package provides the given value"
+msgstr "Etsi annetun arvon tarjoava paketti"
+
+#: ../yumcommands.py:573
+msgid "Check for available package updates"
+msgstr "Etsi saatavilla olevia pakettipäivityksiä"
+
+#: ../yumcommands.py:623
+msgid "Search package details for the given string"
+msgstr "Etsi pakettitiedoista annettua merkkijonoa"
+
+#: ../yumcommands.py:629
+msgid "Searching Packages: "
+msgstr "Etsitään paketteja: "
+
+#: ../yumcommands.py:646
+msgid "Update packages taking obsoletes into account"
+msgstr "Päivitä paketit ottaen vanhennukset huomioon"
+
+#: ../yumcommands.py:654
+msgid "Setting up Upgrade Process"
+msgstr "Aloitetaan päivitysprosessi"
+
+#: ../yumcommands.py:668
+msgid "Install a local RPM"
+msgstr "Asenna paikallinen RPM-tiedosto"
+
+#: ../yumcommands.py:676
+msgid "Setting up Local Package Process"
+msgstr "Aloitetaan paikallinen pakettiprosessi"
+
+#: ../yumcommands.py:695
+msgid "Determine which package provides the given dependency"
+msgstr "Selvitä mikä paketti tarjoaa annetun riippuvuuden"
+
+#: ../yumcommands.py:698
+msgid "Searching Packages for Dependency:"
+msgstr "Etsitään riippuvuutta paketeista:"
+
+#: ../yumcommands.py:712
+msgid "Run an interactive yum shell"
+msgstr "Suorita interaktiivinen yum-komentorivi"
+
+#: ../yumcommands.py:718
+msgid "Setting up Yum Shell"
+msgstr "Asetetaan Yum-komentoriviä"
+
+#: ../yumcommands.py:736
+msgid "List a package's dependencies"
+msgstr "Luettele paketin riippuvuudet"
+
+#: ../yumcommands.py:742
+msgid "Finding dependencies: "
+msgstr "Etsitään riippuvuuksia: "
+
+#: ../yumcommands.py:758
+msgid "Display the configured software repositories"
+msgstr "Näytä asetetut asennuslähteet"
+
+#: ../yumcommands.py:810 ../yumcommands.py:811
+msgid "enabled"
+msgstr "käytössä"
+
+#: ../yumcommands.py:819 ../yumcommands.py:820
+msgid "disabled"
+msgstr "poissa käytöstä"
+
+#: ../yumcommands.py:834
+msgid "Repo-id : "
+msgstr "Lähdetunnus : "
+
+#: ../yumcommands.py:835
+msgid "Repo-name : "
+msgstr "Lähdenimi : "
+
+#: ../yumcommands.py:836
+msgid "Repo-status : "
+msgstr "Lähteen tila : "
+
+#: ../yumcommands.py:838
+msgid "Repo-revision: "
+msgstr "Lähderevisio : "
+
+#: ../yumcommands.py:842
+msgid "Repo-tags : "
+msgstr "Lähteen tagit : "
+
+#: ../yumcommands.py:848
+msgid "Repo-distro-tags: "
+msgstr "Lähteen jakelutagit: "
+
+#: ../yumcommands.py:853
+msgid "Repo-updated : "
+msgstr "Lähde päivitetty : "
+
+#: ../yumcommands.py:855
+msgid "Repo-pkgs : "
+msgstr "Lähteen paketit : "
+
+#: ../yumcommands.py:856
+msgid "Repo-size : "
+msgstr "Lähteen koko : "
+
+#: ../yumcommands.py:863
+msgid "Repo-baseurl : "
+msgstr "Lähteen baseurl : "
+
+#: ../yumcommands.py:871
+msgid "Repo-metalink: "
+msgstr "Lähteen metalink : "
+
+#: ../yumcommands.py:875
+msgid " Updated : "
+msgstr " Päivitetty : "
+
+#: ../yumcommands.py:878
+msgid "Repo-mirrors : "
+msgstr "Lähteen peilit : "
+
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr "Ei koskaan (viimeksi: %s)"
+
+#: ../yumcommands.py:890
+#, python-format
+msgid "Instant (last: %s)"
+msgstr "Heti (viimeksi: %s)"
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr "%s sekunti(a) (viimeksi: %s)"
+
+#: ../yumcommands.py:895
+msgid "Repo-expire : "
+msgstr "Lähde vanhentuu : "
+
+#: ../yumcommands.py:898
+msgid "Repo-exclude : "
+msgstr "Lähde ohittaa : "
+
+#: ../yumcommands.py:902
+msgid "Repo-include : "
+msgstr "Lähde sisältää : "
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:912 ../yumcommands.py:938
+msgid "repo id"
+msgstr "lähdetunnus"
+
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
+msgid "status"
+msgstr "tila"
+
+#: ../yumcommands.py:939
+msgid "repo name"
+msgstr "lähdenimi"
+
+#: ../yumcommands.py:965
+msgid "Display a helpful usage message"
+msgstr "Näytä käyttöohjeviesti"
+
+#: ../yumcommands.py:999
+#, python-format
+msgid "No help available for %s"
+msgstr "Ei ohjeita komennolle %s"
+
+#: ../yumcommands.py:1004
+msgid ""
+"\n"
+"\n"
+"aliases: "
+msgstr ""
+"\n"
+"\n"
+"muut nimet: "
+
+#: ../yumcommands.py:1006
+msgid ""
+"\n"
+"\n"
+"alias: "
+msgstr ""
+"\n"
+"\n"
+"toinen nimi: "
+
+#: ../yumcommands.py:1034
+msgid "Setting up Reinstall Process"
+msgstr "Aloitetaan uudelleenasennusprosessi"
+
+#: ../yumcommands.py:1042
+msgid "reinstall a package"
+msgstr "asenna paketti uudelleen"
+
+#: ../yumcommands.py:1060
+msgid "Setting up Downgrade Process"
+msgstr "Aloitetaan varhennusprosessi"
+
+#: ../yumcommands.py:1067
+msgid "downgrade a package"
+msgstr "varhenna paketti"
+
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
+msgstr ""
+"Näytä koneella ja/tai käytettävissä olevissa asennuslähteissä oleva versio"
+
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr " Yum-versioryhmät:"
+
+#: ../yumcommands.py:1121
+msgid " Group :"
+msgstr " Ryhmä:"
+
+#: ../yumcommands.py:1122
+msgid " Packages:"
+msgstr " Paketit:"
+
+#: ../yumcommands.py:1152
+msgid "Installed:"
+msgstr "Asennettu:"
+
+#: ../yumcommands.py:1157
+msgid "Group-Installed:"
+msgstr "Asennettu ryhmässä:"
+
+#: ../yumcommands.py:1166
+msgid "Available:"
+msgstr "Saatavilla:"
+
+#: ../yumcommands.py:1172
+msgid "Group-Available:"
+msgstr "Saatavilla ryhmässä:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr "Näytä tai käytä transaktiohistoriaa"
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr "Virheellinen historyn alikomento, käytä: %s."
+
+#: ../yummain.py:128
+msgid "Running"
+msgstr "Suoritetaan"
+
+#: ../yummain.py:129
+msgid "Sleeping"
+msgstr "Unessa"
+
+#: ../yummain.py:130
+msgid "Uninteruptable"
+msgstr "Ei voi keskeyttää"
+
+#: ../yummain.py:131
+msgid "Zombie"
+msgstr "Zombi"
+
+#: ../yummain.py:132
+msgid "Traced/Stopped"
+msgstr "Jäljitetään/Pysäytetty"
+
+#: ../yummain.py:137
+msgid " The other application is: PackageKit"
+msgstr " Toinen ohjelma on: PackageKit"
+
+#: ../yummain.py:139
+#, python-format
+msgid " The other application is: %s"
+msgstr " Toinen ohjelma on: %s"
+
+#: ../yummain.py:142
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr " Muisti : %5s RSS (%5sB VSZ)"
+
+#: ../yummain.py:146
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr " Aloitettu : %s - %s sitten"
+
+#: ../yummain.py:148
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr " Tila : %s, pid: %d"
+
+#: ../yummain.py:173
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr ""
+"Toinen ohjelma pitää tällä hetkellä yumin lukkoa, odotetaan että se "
+"lopettaa..."
+
+#: ../yummain.py:201 ../yummain.py:240
+#, python-format
+msgid "Error: %s"
+msgstr "Virhe: %s"
+
+#: ../yummain.py:211 ../yummain.py:253
+#, python-format
+msgid "Unknown Error(s): Exit Code: %d:"
+msgstr "Tuntematon virhe: lopetuskoodi: %d:"
+
+#. Depsolve stage
+#: ../yummain.py:218
+msgid "Resolving Dependencies"
+msgstr "Ratkaistaan riippuvuuksia"
+
+#: ../yummain.py:242
+msgid " You could try using --skip-broken to work around the problem"
+msgstr " Ongelman pystyy ehkä kiertämään valitsimella --skip-broken"
+
+#: ../yummain.py:243
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+" Kokeile komentoja: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+
+#: ../yummain.py:259
+msgid ""
+"\n"
+"Dependencies Resolved"
+msgstr ""
+"\n"
+"Riippuvuudet on ratkaistu"
+
+#: ../yummain.py:326
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel."
+msgstr ""
+"\n"
+"\n"
+"Lopetetaan käyttäjän peruttua."
+
+#: ../yum/depsolve.py:82
+msgid "doTsSetup() will go away in a future version of Yum.\n"
+msgstr "doTsSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/depsolve.py:97
+msgid "Setting up TransactionSets before config class is up"
+msgstr "Asetetaan TransactionSetsit ennen kuin asetusluokka on käytössä"
+
+#: ../yum/depsolve.py:148
+#, python-format
+msgid "Invalid tsflag in config file: %s"
+msgstr "Virheellinen tsflag asetustiedostossa: %s"
+
+#: ../yum/depsolve.py:159
+#, python-format
+msgid "Searching pkgSack for dep: %s"
+msgstr "Etsitään pkgSackista riippuvuutta: %s"
+
+#: ../yum/depsolve.py:175
+#, python-format
+msgid "Potential match for %s from %s"
+msgstr "Mahdollinen vastaavuus haulle %s paketissa %s"
+
+#: ../yum/depsolve.py:183
+#, python-format
+msgid "Matched %s to require for %s"
+msgstr "%s vastaa vaatimusta %s"
+
+#: ../yum/depsolve.py:224
+#, python-format
+msgid "Member: %s"
+msgstr "Jäsen: %s"
+
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
+#, python-format
+msgid "%s converted to install"
+msgstr "%s muutettu asennukseksi"
+
+#: ../yum/depsolve.py:245
+#, python-format
+msgid "Adding Package %s in mode %s"
+msgstr "Lisätään paketti %s tilassa %s"
+
+#: ../yum/depsolve.py:255
+#, python-format
+msgid "Removing Package %s"
+msgstr "Poistetaan paketti %s"
+
+#: ../yum/depsolve.py:277
+#, python-format
+msgid "%s requires: %s"
+msgstr "%s vaatii: %s"
+
+#: ../yum/depsolve.py:335
+msgid "Needed Require has already been looked up, cheating"
+msgstr "Tarvittava vaatimus on jo etsitty, huijataan"
+
+#: ../yum/depsolve.py:345
+#, python-format
+msgid "Needed Require is not a package name. Looking up: %s"
+msgstr "Tarvittava vaatimus ei ole pakettinimi. Etsitään: %s"
+
+#: ../yum/depsolve.py:352
+#, python-format
+msgid "Potential Provider: %s"
+msgstr "Mahdollinen tarjoaja: %s"
+
+#: ../yum/depsolve.py:375
+#, python-format
+msgid "Mode is %s for provider of %s: %s"
+msgstr "Tila %s riippuvuuden %s: %s tarjoajalla"
+
+#: ../yum/depsolve.py:379
+#, python-format
+msgid "Mode for pkg providing %s: %s"
+msgstr "Riippuvuuden %s: %s tarjoavan paketin tila"
+
+#: ../yum/depsolve.py:383
+#, python-format
+msgid "TSINFO: %s package requiring %s marked as erase"
+msgstr ""
+"TSINFO: paketti %s, joka vaatii riippuvuuden %s on merkitty poistettavaksi"
+
+#: ../yum/depsolve.py:396
+#, python-format
+msgid "TSINFO: Obsoleting %s with %s to resolve dep."
+msgstr ""
+"TSINFO: Vanhennetaan paketti %s paketilla %s riippuvuuden ratkaisemiseksi."
+
+#: ../yum/depsolve.py:399
+#, python-format
+msgid "TSINFO: Updating %s to resolve dep."
+msgstr "TSINFO: Päivitetään paketti %s riippuvuuden ratkaisemiseksi."
+
+#: ../yum/depsolve.py:407
+#, python-format
+msgid "Cannot find an update path for dep for: %s"
+msgstr "Päivityspolkua ei löydetty riippuvuudelle: %s"
+
+#: ../yum/depsolve.py:417
+#, python-format
+msgid "Unresolvable requirement %s for %s"
+msgstr "Ratkaisematon riippuvuus %s paketille %s"
+
+#: ../yum/depsolve.py:440
+#, python-format
+msgid "Quick matched %s to require for %s"
+msgstr "Pikavastaavuus %s vaatimukselle %s"
+
+#. is it already installed?
+#: ../yum/depsolve.py:482
+#, python-format
+msgid "%s is in providing packages but it is already installed, removing."
+msgstr "%s on tarjoavissa paketeissa, mutta se on jo asennettuna, poistetaan."
+
+#: ../yum/depsolve.py:498
+#, python-format
+msgid "Potential resolving package %s has newer instance in ts."
+msgstr "Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi ts:ssä."
+
+#: ../yum/depsolve.py:509
+#, python-format
+msgid "Potential resolving package %s has newer instance installed."
+msgstr ""
+"Mahdollisella ratkaisevalla paketilla %s on uudempi instanssi asennettuna."
+
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
+#, python-format
+msgid "Missing Dependency: %s is needed by package %s"
+msgstr "Puuttuva riippuvuus: %s tarvitaan paketille %s"
+
+#: ../yum/depsolve.py:530
+#, python-format
+msgid "%s already in ts, skipping this one"
+msgstr "paketti %s on jo ts:ssä, ohitetaan"
+
+#: ../yum/depsolve.py:573
+#, python-format
+msgid "TSINFO: Marking %s as update for %s"
+msgstr "TSINFO: Merkitään paketti %s päivitykseksi paketille %s"
+
+#: ../yum/depsolve.py:581
+#, python-format
+msgid "TSINFO: Marking %s as install for %s"
+msgstr "TSINFO: Merkitään %s asennukseksi paketille %s"
+
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
+msgid "Success - empty transaction"
+msgstr "Onnistui - tyhjä transaktio"
+
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
+msgid "Restarting Loop"
+msgstr "Käynnistetään silmukka uudelleen"
+
+#: ../yum/depsolve.py:755
+msgid "Dependency Process ending"
+msgstr "Riippuvuuksien käsittely päättyy"
+
+#: ../yum/depsolve.py:761
+#, python-format
+msgid "%s from %s has depsolving problems"
+msgstr "paketilla %s asennuslähteestä %s on riippuvuusongelmia"
+
+#: ../yum/depsolve.py:768
+msgid "Success - deps resolved"
+msgstr "Onnistui – riippuvuudet on ratkaistu"
+
+#: ../yum/depsolve.py:782
+#, python-format
+msgid "Checking deps for %s"
+msgstr "Tarkistetaan paketin %s riippuvuuksia"
+
+#: ../yum/depsolve.py:865
+#, python-format
+msgid "looking for %s as a requirement of %s"
+msgstr "etsitään riippuvuutta %s paketille %s"
+
+#: ../yum/depsolve.py:1007
+#, python-format
+msgid "Running compare_providers() for %s"
+msgstr "Suoritetaan compare_providers() paketeille %s"
+
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
+#, python-format
+msgid "better arch in po %s"
+msgstr "po:ssa %s on parempi arkkitehtuuri"
+
+#: ../yum/depsolve.py:1142
+#, python-format
+msgid "%s obsoletes %s"
+msgstr "paketti %s vanhentaa paketin %s"
+
+#: ../yum/depsolve.py:1154
+#, python-format
+msgid ""
+"archdist compared %s to %s on %s\n"
+" Winner: %s"
+msgstr ""
+"archdist vertasi paketteja %s ja %s arkkitehtuurilla %s\n"
+" Voittaja: %s"
+
+#: ../yum/depsolve.py:1161
+#, python-format
+msgid "common sourcerpm %s and %s"
+msgstr "paketeilla %s ja %s on yhteinen lähde-RPM"
+
+#: ../yum/depsolve.py:1167
+#, python-format
+msgid "common prefix of %s between %s and %s"
+msgstr "yhteinen %s merkin mittainen etuliite paketeilla %s ja %s"
+
+#: ../yum/depsolve.py:1175
+#, python-format
+msgid "Best Order: %s"
+msgstr "Paras järjestys %s"
+
+#: ../yum/__init__.py:187
+msgid "doConfigSetup() will go away in a future version of Yum.\n"
+msgstr "doConfigSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/__init__.py:412
+#, python-format
+msgid "Repository %r is missing name in configuration, using id"
+msgstr "Asennuslähteen %r asetuksista puuttuu nimi, käytetään tunnistetta"
+
+#: ../yum/__init__.py:450
+msgid "plugins already initialised"
+msgstr "liitännäiset on jo alustettu"
+
+#: ../yum/__init__.py:457
+msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
+msgstr "doRpmSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/__init__.py:468
+msgid "Reading Local RPMDB"
+msgstr "Luetaan paikallista RPM-tietokantaa"
+
+#: ../yum/__init__.py:489
+msgid "doRepoSetup() will go away in a future version of Yum.\n"
+msgstr "doRepoSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/__init__.py:509
+msgid "doSackSetup() will go away in a future version of Yum.\n"
+msgstr "doSackSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/__init__.py:539
+msgid "Setting up Package Sacks"
+msgstr "Asetetaan pakettisäkkejä"
+
+#: ../yum/__init__.py:584
+#, python-format
+msgid "repo object for repo %s lacks a _resetSack method\n"
+msgstr "asennuslähteen %s oliosta puuttuu _resetSack-metodi\n"
+
+#: ../yum/__init__.py:585
+msgid "therefore this repo cannot be reset.\n"
+msgstr "siksi tätä asennuslähdettä ei voi palauttaa alkutilaan.\n"
+
+#: ../yum/__init__.py:590
+msgid "doUpdateSetup() will go away in a future version of Yum.\n"
+msgstr "doUpdateSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/__init__.py:602
+msgid "Building updates object"
+msgstr "Rakennetaan päivitysoliota"
+
+#: ../yum/__init__.py:637
+msgid "doGroupSetup() will go away in a future version of Yum.\n"
+msgstr "doGroupSetup() poistetaan jossakin Yumin tulevassa versiossa.\n"
+
+#: ../yum/__init__.py:662
+msgid "Getting group metadata"
+msgstr "Haetaan ryhmien metadataa"
+
+#: ../yum/__init__.py:688
+#, python-format
+msgid "Adding group file from repository: %s"
+msgstr "Lisätään ryhmätiedosto asennuslähteestä: %s"
+
+#: ../yum/__init__.py:697
+#, python-format
+msgid "Failed to add groups file for repository: %s - %s"
+msgstr "Ryhmätiedoston lisääminen asennuslähteelle epäonnistui: %s - %s"
+
+#: ../yum/__init__.py:703
+msgid "No Groups Available in any repository"
+msgstr "Yhtään ryhmää ei ole saatavilla mistään asennuslähteestä"
+
+#: ../yum/__init__.py:763
+msgid "Importing additional filelist information"
+msgstr "Tuodaan lisää tiedostoluettelotietoa"
+
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr "Ohjelma %s%s%s on paketissa yum-utils."
+
+#: ../yum/__init__.py:785
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+"Keskeneräisiä transaktioita on jäljellä. Niiden päättämiseksi on suositeltua "
+"suorittaa ensin yum-complete-transaction."
+
+#: ../yum/__init__.py:853
+#, python-format
+msgid "Skip-broken round %i"
+msgstr "Skip-broken, kierros %i"
+
+#: ../yum/__init__.py:906
+#, python-format
+msgid "Skip-broken took %i rounds "
+msgstr "Skip-broken vaati %i kierrosta"
+
+#: ../yum/__init__.py:907
+msgid ""
+"\n"
+"Packages skipped because of dependency problems:"
+msgstr ""
+"\n"
+"Riippuvuusongelmien vuoksi ohitetut paketit:"
+
+#: ../yum/__init__.py:911
+#, python-format
+msgid " %s from %s"
+msgstr " %s asennuslähteestä %s"
+
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+"Varoitus: sovelmien virheitä tai muita virheitä, jotka eivät ole vakavia, "
+"tapahtui transaktion aikana."
+
+#: ../yum/__init__.py:1101
+#, python-format
+msgid "Failed to remove transaction file %s"
+msgstr "Transaktiotiedoston %s poistaminen epäonnistui"
+
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
+#, python-format
+msgid "%s was supposed to be installed but is not!"
+msgstr "%s piti olla asennettuna, mutta se ei ole!"
+
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
+#, python-format
+msgid "%s was supposed to be removed but is not!"
+msgstr "%s piti olla poistettu, mutta se ei ole!"
+
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1289
+#, python-format
+msgid "Unable to check if PID %s is active"
+msgstr "Ei voida tarkistaa onko PID %s aktiivinen"
+
+#. Another copy seems to be running.
+#: ../yum/__init__.py:1293
+#, python-format
+msgid "Existing lock %s: another copy is running as pid %s."
+msgstr "Lukko %s on olemassa: toinen kopio on suorituksessa pidillä %s."
+
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr "Ei voitu luoda lukkoa sijaintiin %s: %s"
+
+#: ../yum/__init__.py:1373
+msgid "Package does not match intended download"
+msgstr "Paketti ei vastaa aiottua latausta"
+
+#: ../yum/__init__.py:1388
+msgid "Could not perform checksum"
+msgstr "Ei voitu laskea tarkistussummaa"
+
+#: ../yum/__init__.py:1391
+msgid "Package does not match checksum"
+msgstr "Paketti ei vastaa tarkistussummaa"
+
+#: ../yum/__init__.py:1433
+#, python-format
+msgid "package fails checksum but caching is enabled for %s"
+msgstr ""
+"paketti ei vastaa tarkistussummaa, mutta välimuisti on käytössä kohteelle %s"
+
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
+#, python-format
+msgid "using local copy of %s"
+msgstr "käytetään paikallista kopiota paketista %s"
+
+#: ../yum/__init__.py:1477
+#, python-format
+msgid ""
+"Insufficient space in download directory %s\n"
+" * free %s\n"
+" * needed %s"
+msgstr ""
+"Lataushakemistossa %s ei ole tarpeeksi vapaata tilaa\n"
+" * vapaana %s\n"
+" * tarvitaan %s"
+
+#: ../yum/__init__.py:1526
+msgid "Header is not complete."
+msgstr "Otsake ei ole täydellinen."
+
+#: ../yum/__init__.py:1563
+#, python-format
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+msgstr ""
+"Otsake ei ole paikallisessa välimuistissa ja pelkästä välimuistista toimiva "
+"tila on käytössä. Ei voida ladata otsaketta %s"
+
+#: ../yum/__init__.py:1618
+#, python-format
+msgid "Public key for %s is not installed"
+msgstr "Julkista avainta pakettia %s varten ei ole asennettu"
+
+#: ../yum/__init__.py:1622
+#, python-format
+msgid "Problem opening package %s"
+msgstr "Ongelma paketin %s avaamisessa"
+
+#: ../yum/__init__.py:1630
+#, python-format
+msgid "Public key for %s is not trusted"
+msgstr "Paketin %s julkiseen avaimeen ei luoteta"
+
+#: ../yum/__init__.py:1634
+#, python-format
+msgid "Package %s is not signed"
+msgstr "Pakettia %s ei ole allekirjoitettu"
+
+#: ../yum/__init__.py:1672
+#, python-format
+msgid "Cannot remove %s"
+msgstr "Ei voida poistaa tiedostoa %s"
+
+#: ../yum/__init__.py:1676
+#, python-format
+msgid "%s removed"
+msgstr "tiedosto %s on poistettu"
+
+#: ../yum/__init__.py:1712
+#, python-format
+msgid "Cannot remove %s file %s"
+msgstr "Ei voida poistaa %s-tyyppistä tiedostoa %s"
+
+#: ../yum/__init__.py:1716
+#, python-format
+msgid "%s file %s removed"
+msgstr "%s-tyyppinen tiedosto %s on poistettu"
+
+#: ../yum/__init__.py:1718
+#, python-format
+msgid "%d %s files removed"
+msgstr "%d %s-tyyppistä tiedostoa on poistettu"
+
+#: ../yum/__init__.py:1787
+#, python-format
+msgid "More than one identical match in sack for %s"
+msgstr "Säkissä on useampi kuin yksi identtinen vastaavuus haulle %s"
+
+#: ../yum/__init__.py:1793
+#, python-format
+msgid "Nothing matches %s.%s %s:%s-%s from update"
+msgstr "Mikään ei vastaa päivityksen pakettia %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:2026
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum. Use searchGenerator() instead. \n"
+msgstr ""
+"searchPackages() poistetaan jossakin Yumin tulevassa versiossa. Käytä sen "
+"sijaan searchGenerator()-metodia.\n"
+
+#: ../yum/__init__.py:2065
+#, python-format
+msgid "Searching %d packages"
+msgstr "Etsitään %d pakettia"
+
+#: ../yum/__init__.py:2069
+#, python-format
+msgid "searching package %s"
+msgstr "etsitään pakettia %s"
+
+#: ../yum/__init__.py:2081
+msgid "searching in file entries"
+msgstr "etsitään tiedostoista"
+
+#: ../yum/__init__.py:2088
+msgid "searching in provides entries"
+msgstr "etsitään tarjoajista"
+
+#: ../yum/__init__.py:2121
+#, python-format
+msgid "Provides-match: %s"
+msgstr "Tarjoajavastaavuus: %s"
+
+#: ../yum/__init__.py:2170
+msgid "No group data available for configured repositories"
+msgstr "Asetetuille asennuslähteille ei ole saatavilla ryhmädataa"
+
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
+#, python-format
+msgid "No Group named %s exists"
+msgstr "Ryhmää nimeltä %s ei ole olemassa"
+
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
+#, python-format
+msgid "package %s was not marked in group %s"
+msgstr "pakettia %s ei ollut merkitty kuuluvaksi ryhmään %s"
+
+#: ../yum/__init__.py:2279
+#, python-format
+msgid "Adding package %s from group %s"
+msgstr "Lisätään paketti %s ryhmästä %s"
+
+#: ../yum/__init__.py:2283
+#, python-format
+msgid "No package named %s available to be installed"
+msgstr "Pakettia nimeltä %s ei ole saatavilla asennusta varten"
+
+#: ../yum/__init__.py:2380
+#, python-format
+msgid "Package tuple %s could not be found in packagesack"
+msgstr "Paketti-tuplea %s ei löytynyt pakettisäkistä"
+
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Paketti-tuplea %s ei löytynyt RPM-tietokannasta"
+
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
+msgid "Invalid version flag"
+msgstr "Virheellinen versiolippu"
+
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
+#, python-format
+msgid "No Package found for %s"
+msgstr "Riippuvuudelle %s ei löytynyt pakettia"
+
+#: ../yum/__init__.py:2696
+msgid "Package Object was not a package object instance"
+msgstr "Pakettiolio ei ollutkaan pakettiolioinstanssi"
+
+#: ../yum/__init__.py:2700
+msgid "Nothing specified to install"
+msgstr "Mitään ei määritelty asennettavaksi"
+
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
+#, python-format
+msgid "Checking for virtual provide or file-provide for %s"
+msgstr "Etsitään virtuaalista tai tiedostotarjoajaa argumentille %s"
+
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
+#, python-format
+msgid "No Match for argument: %s"
+msgstr "Mikään ei vastaa argumenttia: %s"
+
+#: ../yum/__init__.py:2798
+#, python-format
+msgid "Package %s installed and not available"
+msgstr "Paketti %s on asennettu, mutta ei saatavilla"
+
+#: ../yum/__init__.py:2801
+msgid "No package(s) available to install"
+msgstr "Yhtään pakettia ei ole saatavilla asennettavaksi"
+
+#: ../yum/__init__.py:2813
+#, python-format
+msgid "Package: %s - already in transaction set"
+msgstr "Paketti: %s – on jo transaktiojoukossa"
+
+#: ../yum/__init__.py:2839
+#, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr "Paketin %s vanhentaa paketti %s, joka on jo asennettuna"
+
+#: ../yum/__init__.py:2842
+#, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr "Paketin %s vanhentaa paketti %s, yritetään paketti %s sen sijaan"
+
+#: ../yum/__init__.py:2850
+#, python-format
+msgid "Package %s already installed and latest version"
+msgstr "Paketti %s on jo asennettuna ja uusin versio"
+
+#: ../yum/__init__.py:2864
+#, python-format
+msgid "Package matching %s already installed. Checking for update."
+msgstr ""
+"Pakettia %s vastaava paketti on jo asennettuna. Tarkistetaan päivitykset."
+
+#. update everything (the easy case)
+#: ../yum/__init__.py:2966
+msgid "Updating Everything"
+msgstr "Päivitetään kaikki"
+
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
+#, python-format
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+msgstr "Vanhennettua pakettia ei päivitetä: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#: ../yum/__init__.py:3093
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr "Paketti on jo vanhennettu: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3124
+#, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Ei päivitetä vanhennettua pakettia: %s"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr "Jo päivitettyä pakettia ei enää päivitetä: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3218
+msgid "No package matched to remove"
+msgstr "Yhtään poistopyyntöä vastaavaa pakettia ei ole"
+
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
+#, python-format
+msgid "Cannot open file: %s. Skipping."
+msgstr "Ei voida avata tiedostoa: %s. Ohitetaan."
+
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
+#, python-format
+msgid "Examining %s: %s"
+msgstr "Tutkitaan %s: %s"
+
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr ""
+"Pakettia %s ei voida lisätä transaktioon. Arkkitehtuuri ei ole yhteensopiva: "
+"%s"
+
+#: ../yum/__init__.py:3270
+#, python-format
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr ""
+"Pakettia %s ei ole asennettu, sitä ei voida päivittää. Suorita yum install -"
+"komento paketin asentamiseksi."
+
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
+#, python-format
+msgid "Excluding %s"
+msgstr "Ohitetaan paketti %s"
+
+#: ../yum/__init__.py:3304
+#, python-format
+msgid "Marking %s to be installed"
+msgstr "Merkitään paketti %s asennettavaksi"
+
+#: ../yum/__init__.py:3310
+#, python-format
+msgid "Marking %s as an update to %s"
+msgstr "Merkitään paketti %s päivitykseksi paketille %s"
+
+#: ../yum/__init__.py:3317
+#, python-format
+msgid "%s: does not update installed package."
+msgstr "%s: ei päivitä asennettua pakettia"
+
+#: ../yum/__init__.py:3379
+msgid "Problem in reinstall: no package matched to remove"
+msgstr "Ongelma uudelleenasennuksessa: poistopyyntöä vastaavaa pakettia ei ole"
+
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
+#, python-format
+msgid "Package %s is allowed multiple installs, skipping"
+msgstr "Paketille %s sallitaan useita asennuksia, ohitetaan."
+
+#: ../yum/__init__.py:3413
+#, python-format
+msgid "Problem in reinstall: no package %s matched to install"
+msgstr ""
+"Ongelma uudelleenasennuksessa: asennuspyyntöä vastaavaa pakettia %s ei ole"
+
+#: ../yum/__init__.py:3515
+msgid "No package(s) available to downgrade"
+msgstr "Yhtään pakettia ei ole saatavilla varhennettavaksi"
+
+#: ../yum/__init__.py:3559
+#, python-format
+msgid "No Match for available package: %s"
+msgstr "Ei vastaavuutta saatavilla olevalle paketille: %s"
+
+#: ../yum/__init__.py:3565
+#, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Vain päivitys saatavilla paketille: %s"
+
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Varhentaminen epäonnistui: %s"
+
+#: ../yum/__init__.py:3704
+#, python-format
+msgid "Retrieving GPG key from %s"
+msgstr "Noudetaan GPG-avain osoitteesta %s"
+
+#: ../yum/__init__.py:3724
+msgid "GPG key retrieval failed: "
+msgstr "GPG-avaimen nouto epäonnistui: "
+
+#: ../yum/__init__.py:3735
+#, python-format
+msgid "GPG key parsing failed: key does not have value %s"
+msgstr "GPG-avaimen jäsentäminen epäonnistui: avaimessa ei ole arvoa %s"
+
+#: ../yum/__init__.py:3767
+#, python-format
+msgid "GPG key at %s (0x%s) is already installed"
+msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo asennetuna"
+
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
+#, python-format
+msgid "Importing GPG key 0x%s \"%s\" from %s"
+msgstr "Tuodaan GPG-avain 0x%s ”%s” osoitteesta %s"
+
+#: ../yum/__init__.py:3789
+msgid "Not installing key"
+msgstr "Avainta ei asenneta"
+
+#: ../yum/__init__.py:3795
+#, python-format
+msgid "Key import failed (code %d)"
+msgstr "Avaimen tuonti epäonnistui (koodi %d)"
+
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
+msgid "Key imported successfully"
+msgstr "Avaimen tuonti onnistui"
+
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
+#, python-format
+msgid ""
+"The GPG keys listed for the \"%s\" repository are already installed but they "
+"are not correct for this package.\n"
+"Check that the correct key URLs are configured for this repository."
+msgstr ""
+"Asennuslähteelle ”%s” luetellut GPG-avaimet on jo asennettu, mutta ne eivät "
+"vastaa tätä pakettia.\n"
+"Tarkista että tälle asennuslähteelle on asetettu oikeat avainten URL:t."
+
+#: ../yum/__init__.py:3810
+msgid "Import of key(s) didn't help, wrong key(s)?"
+msgstr "Avainten tuonti ei auttanut, ovatko avaimet vääriä?"
+
+#: ../yum/__init__.py:3829
+#, python-format
+msgid "GPG key at %s (0x%s) is already imported"
+msgstr "Osoitteesta %s ladattu GPG-avain (0x%s) on jo tuotu"
+
+#: ../yum/__init__.py:3849
+#, python-format
+msgid "Not installing key for repo %s"
+msgstr "Ei asenneta avainta asennuslähteelle %s"
+
+#: ../yum/__init__.py:3854
+msgid "Key import failed"
+msgstr "Avaimen tuonti epäonnistui"
+
+#: ../yum/__init__.py:3976
+msgid "Unable to find a suitable mirror."
+msgstr "Sopivaa peilipalvelinta ei löytynyt."
+
+#: ../yum/__init__.py:3978
+msgid "Errors were encountered while downloading packages."
+msgstr "Paketteja ladatessa tapahtui virheitä."
+
+#: ../yum/__init__.py:4028
+#, python-format
+msgid "Please report this error at %s"
+msgstr "Ilmoita tästä ongelmasta: %s"
+
+#: ../yum/__init__.py:4052
+msgid "Test Transaction Errors: "
+msgstr "Testitransaktion virheitä: "
+
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:202
+msgid "Loaded plugins: "
+msgstr "Ladatut liitännäiset: "
+
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
+#, python-format
+msgid "No plugin match for: %s"
+msgstr "Ei vastaavaa liitännäistä pyynnölle: %s"
+
+#: ../yum/plugins.py:252
+#, python-format
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr "Ei ladata liitännäistä ”%s”, koska se on poissa käytöstä"
+
+#. Give full backtrace:
+#: ../yum/plugins.py:264
+#, python-format
+msgid "Plugin \"%s\" can't be imported"
+msgstr "Liitännäistä ”%s” ei voi tuoda"
+
+#: ../yum/plugins.py:271
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr "Liitännäinen ”%s” ei määrittele vaadittua API-versiota"
+
+#: ../yum/plugins.py:276
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr "Liitännäinen ”%s” vaatii API:n %s. Tuettu API on %s."
+
+#: ../yum/plugins.py:309
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr "Ladataan liitännäinen ”%s”"
+
+#: ../yum/plugins.py:316
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr "Liitännäisten hakupolussa on useita liitännäisiä nimeltä ”%s”"
+
+#: ../yum/plugins.py:336
+#, python-format
+msgid "Configuration file %s not found"
+msgstr "Asetustiedostoa %s ei löytynyt"
+
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:339
+#, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr "Liitännäisen %s asetustiedostoa ei löytynyt"
+
+#: ../yum/plugins.py:501
+msgid "registration of commands not supported"
+msgstr "komentojen rekisteröintiä ei tueta"
+
+#: ../yum/rpmtrans.py:78
+msgid "Repackaging"
+msgstr "Paketoidaan uudelleen"
+
+#: ../rpmUtils/oldUtils.py:33
+#, python-format
+msgid "Header cannot be opened or does not match %s, %s."
+msgstr "Otsaketta ei voi avata tai se ei vastaa nimeä ja arkkitehtuuria %s, %s"
+
+#: ../rpmUtils/oldUtils.py:53
+#, python-format
+msgid "RPM %s fails md5 check"
+msgstr "RPM %s ei läpäise md5-tarkistusta"
+
+#: ../rpmUtils/oldUtils.py:151
+msgid "Could not open RPM database for reading. Perhaps it is already in use?"
+msgstr "RPM-tietokantaa ei voitu avata lukemista varten. Onko se jo käytössä?"
+
+#: ../rpmUtils/oldUtils.py:183
+msgid "Got an empty Header, something has gone wrong"
+msgstr "Saatiin tyhjä otsake, virhetilanne"
+
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
+#, python-format
+msgid "Damaged Header %s"
+msgstr "Vioittunut otsake %s"
+
+#: ../rpmUtils/oldUtils.py:281
+#, python-format
+msgid "Error opening rpm %s - error %s"
+msgstr "Virhe avattaessa RPM:ää %s – virhe %s"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() poistetaan, käytä sen sijaan metodia self."
+#~ "rpmdb.searchPkgTuple().\n"
diff --git a/po/fr.po b/po/fr.po
index 0106e74..67454ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-03 04:38+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-10-06 20:36+0100\n"
"Last-Translator: Michel Duquaine <michelduquaine@gmail.com>\n"
"Language-Team: French <fedora-trans-fr@redhat.com>\n"
@@ -20,49 +20,33 @@ msgstr ""
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../callback.py:48
-#: ../output.py:940
-#: ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Mise à jour"
-#: ../callback.py:49
-#: ../yum/rpmtrans.py:72
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr "Suppression"
-#: ../callback.py:50
-#: ../callback.py:51
-#: ../callback.py:53
-#: ../output.py:939
-#: ../yum/rpmtrans.py:73
-#: ../yum/rpmtrans.py:74
-#: ../yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installation"
-#: ../callback.py:52
-#: ../callback.py:58
-#: ../yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr "Obsolète"
-#: ../callback.py:54
-#: ../output.py:1063
-#: ../output.py:1401
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Mis à jour"
-#: ../callback.py:55
-#: ../output.py:1397
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Supprimé"
-#: ../callback.py:56
-#: ../callback.py:57
-#: ../callback.py:59
-#: ../output.py:1061
-#: ../output.py:1393
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Installé"
@@ -84,73 +68,68 @@ msgstr "Erreur : statut de sortie invalide : %s pour %s"
msgid "Erased: %s"
msgstr "Supprimé : %s"
-#: ../callback.py:217
-#: ../output.py:941
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Suppression"
-#: ../callback.py:219
-#: ../yum/rpmtrans.py:77
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr "Nettoyage"
-#: ../cli.py:108
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Commande « %s » déjà définie"
-#: ../cli.py:120
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Configuration des dépôts"
-#: ../cli.py:131
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Lecture des méta données du dépôt depuis les fichiers locaux"
-#: ../cli.py:194
-#: ../utils.py:102
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Erreur de configuration : %s"
-#: ../cli.py:197
-#: ../cli.py:1253
-#: ../utils.py:105
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Erreur d'options : %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Installé : %s-%s à %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Compilé : %s à %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Commité : %s à %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Vous devez spécifier des commandes"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Besoins en espace disque :\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr "Au moins %dMB requis sur le système de fichiers %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -158,266 +137,259 @@ msgstr ""
"Résumé des erreurs\n"
"-------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
-msgstr "Tentative d'exécution de la transaction mais aucune tâche à effectuer. Sortie."
+msgstr ""
+"Tentative d'exécution de la transaction mais aucune tâche à effectuer. "
+"Sortie."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Arrêt à la demande de l'utilisateur"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Téléchargement des paquets :"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Erreur durant le téléchargement des paquets :\n"
-#: ../cli.py:420
-#: ../yum/__init__.py:3996
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Lancement de rpm_check_debug"
-#: ../cli.py:429
-#: ../yum/__init__.py:4005
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "ERREUR Vous devez mettre à jour rpm pour manipuler :"
-#: ../cli.py:431
-#: ../yum/__init__.py:4008
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "ERREUR de résolution de dépendance par rpm_check_debug :"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "RPM doit être mis à jour"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Veuillez reporter cette erreur dans %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Lancement de la transaction de test"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Transaction de test terminée"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Erreur du contrôle de transaction :\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Transaction de test réussie"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Lancement de la transaction"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-"Refus de l'importation automatique des clés lors d'une exécution inattendue.\n"
+"Refus de l'importation automatique des clés lors d'une exécution "
+"inattendue.\n"
"Utilisez l'option « -y » pour passer outre."
-#: ../cli.py:540
-#: ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Vouliez-vous dire : "
-#: ../cli.py:557
-#: ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Paquet(s) %s%s%s disponible(s), mais non installé(s)."
-#: ../cli.py:571
-#: ../cli.py:602
-#: ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Aucun paquet %s%s%s disponible."
-#: ../cli.py:607
-#: ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Paquet(s) à installer"
-#: ../cli.py:608
-#: ../cli.py:686
-#: ../cli.py:719
-#: ../cli.py:741
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Rien à faire"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paquets marqués pour mise à jour"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Aucun paquet marqué pour mise à jour"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paquets marqués pour suppression"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Aucun paquet marqué pour suppression"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Paquet(s) à rétrograder"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr "(depuis %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Paquet installé %s%s%s%s indisponible."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Paquet(s) à ré-installer"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Pas de paquet fourni"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Attention : Aucune correspondance trouvée pour : %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Aucune correspondance trouvée"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-"Avertissement : les versions 3.0.x de yum risquent d'indiquer des erreurs de correspondances dans les noms de fichiers.\n"
-"Vous pouvez utiliser « %s*/%s%s » et/ou « %s*bin/%s%s » pour obtenir ce comportement"
+"Avertissement : les versions 3.0.x de yum risquent d'indiquer des erreurs de "
+"correspondances dans les noms de fichiers.\n"
+"Vous pouvez utiliser « %s*/%s%s » et/ou « %s*bin/%s%s » pour obtenir ce "
+"comportement"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Aucun paquet trouvé pour %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Nettoyage complet"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Nettoyage des en-têtes"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Nettoyage des paquets"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Nettoyage des méta données xml"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Nettoyage du cache de la base de données"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Nettoyage des méta données expirées dans le cache"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Nettoyage des modules complémentaires"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Groupes installés :"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Groupes disponibles :"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Effectué"
-#: ../cli.py:972
-#: ../cli.py:990
-#: ../cli.py:996
-#: ../yum/__init__.py:2622
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Attention : le groupe %s n'existe pas."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
-msgstr "Aucun paquet disponible pour installation ou mise à jour dans les groupes demandés"
+msgstr ""
+"Aucun paquet disponible pour installation ou mise à jour dans les groupes "
+"demandés"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paquet(s) à installer"
-#: ../cli.py:1012
-#: ../yum/__init__.py:2634
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Aucun groupe nommé %s n'existe"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Aucun paquet du groupe à supprimer"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paquet(s) à supprimer"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Le paquet %s est déjà installé, omission"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Rejet du paquet non comparable %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
-msgstr "Pas d'autre %s installé, ajout à la liste pour installation potentielle"
+msgstr ""
+"Pas d'autre %s installé, ajout à la liste pour installation potentielle"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Options du plugin"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Erreur sur la ligne de commande : %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -428,103 +400,105 @@ msgstr ""
"\n"
"%s : l'option %s requiert un argument"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color accepte les paramètres : auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "affiche ce message d'aide et quitte"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "tolérer les erreurs"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "exécuter entièrement depuis le cache, ne pas le mettre à jour"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "emplacement du fichier de configuration"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "temps d'attente maximum de la commande"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "niveau de déboguage pour la sortie"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "afficher les doublons, dans les dépôts, pour les commandes list/search"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "niveau d'erreur pour la sortie"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "opération silencieuse"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "opération verbeuse"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "répondre oui à toutes les questions"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "affiche la version de Yum et quitte"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "définit la racine d'installation"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "active un ou plusieurs dépôts (jokers autorisés)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "désactive un ou plusieurs dépôts (jokers autorisés)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "exclut des paquets par nom ou caractère générique"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
-msgstr "désactive l'exclusion pour le dépôt principal, pour un dépôt particulier ou pour tout"
+msgstr ""
+"désactive l'exclusion pour le dépôt principal, pour un dépôt particulier ou "
+"pour tout"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "active le traitement des paquets obsolètes pendant les mises à jour"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "désactive les modules complémentaires Yum"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "désactive la vérification de clé gpg"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "désactive les modules complémentaires par nom"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "active les modules complémentaires par nom"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "omettre les paquets qui ont des problèmes de dépendances"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "contrôle l'utilisation de la couleur"
@@ -765,7 +739,9 @@ msgstr "Autre :"
#: ../output.py:893
msgid "There was an error calculating total download size"
-msgstr "Une erreur est survenue pendant le calcul de la taille totale des téléchargements"
+msgstr ""
+"Une erreur est survenue pendant le calcul de la taille totale des "
+"téléchargements"
#: ../output.py:898
#, python-format
@@ -797,8 +773,7 @@ msgstr "Mise à jour pour dépendance"
msgid "Removing for dependencies"
msgstr "Suppression pour dépendance"
-#: ../output.py:953
-#: ../output.py:1065
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Omis (problèmes de dépendances)"
@@ -899,11 +874,13 @@ msgstr "deux"
#, python-format
msgid ""
"\n"
-" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s seconds\n"
+" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
+"seconds\n"
"to exit.\n"
msgstr ""
"\n"
-"Téléchargement courant annulé, interruption %s (crtl-c), %s de nouveau dans %s%s%s secondes\n"
+"Téléchargement courant annulé, interruption %s (crtl-c), %s de nouveau dans %"
+"s%s%s secondes\n"
"pour quitter.\n"
#: ../output.py:1155
@@ -914,200 +891,206 @@ msgstr "interruption par l'utilisateur"
msgid "Total"
msgstr "Total"
-#: ../output.py:1201
+#: ../output.py:1203
msgid "<unset>"
msgstr "<indéfini>"
-#: ../output.py:1202
+#: ../output.py:1204
msgid "System"
msgstr "Système"
-#: ../output.py:1238
+#: ../output.py:1240
msgid "Bad transaction IDs, or package(s), given"
msgstr "Le paquet ou l'identifiant de transaction fourni sont erronés"
-#: ../output.py:1282
-#: ../yumcommands.py:1149
-#: ../yum/__init__.py:1060
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
msgid "Warning: RPMDB has been altered since the last yum transaction."
-msgstr "Avertissement : RPMDB a été modifiée depuis la dernière transaction de yum."
+msgstr ""
+"Avertissement : RPMDB a été modifiée depuis la dernière transaction de yum."
-#: ../output.py:1287
+#: ../output.py:1289
msgid "No transaction ID given"
msgstr "Aucun identifiant de transaction n'a été fourni"
-#: ../output.py:1295
+#: ../output.py:1297
msgid "Bad transaction ID given"
msgstr "L'identifiant de transaction fourni est erroné"
-#: ../output.py:1300
+#: ../output.py:1302
msgid "Not found given transaction ID"
msgstr "L'identifiant de transaction fourni est introuvable"
-#: ../output.py:1308
+#: ../output.py:1310
msgid "Found more than one transaction ID!"
msgstr "Plus d'un identifiant de transaction a été trouvé !"
-#: ../output.py:1329
+#: ../output.py:1331
msgid "No transaction ID, or package, given"
msgstr "Le paquet ou l'identifiant de transaction fourni sont absents"
-#: ../output.py:1355
+#: ../output.py:1357
msgid "Transaction ID :"
msgstr "Identifiant de transaction :"
-#: ../output.py:1357
+#: ../output.py:1359
msgid "Begin time :"
msgstr "Temps de début :"
-#: ../output.py:1360
-#: ../output.py:1362
+#: ../output.py:1362 ../output.py:1364
msgid "Begin rpmdb :"
msgstr "Début de rpmdb :"
-#: ../output.py:1376
+#: ../output.py:1378
#, python-format
msgid "(%s seconds)"
msgstr "(%s secondes)"
-#: ../output.py:1377
+#: ../output.py:1379
msgid "End time :"
msgstr "Temps de fin :"
-#: ../output.py:1380
-#: ../output.py:1382
+#: ../output.py:1382 ../output.py:1384
msgid "End rpmdb :"
msgstr "Fin de rpmdb :"
-#: ../output.py:1383
+#: ../output.py:1385
msgid "User :"
msgstr "Utilisateur :"
-#: ../output.py:1385
-#: ../output.py:1387
-#: ../output.py:1389
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
msgid "Return-Code :"
msgstr "Code retour :"
-#: ../output.py:1385
+#: ../output.py:1387
msgid "Aborted"
msgstr "Avorté"
-#: ../output.py:1387
+#: ../output.py:1389
msgid "Failure:"
msgstr "Échec :"
-#: ../output.py:1389
+#: ../output.py:1391
msgid "Success"
msgstr "Réussi"
-#: ../output.py:1390
-msgid "Transaction performed with :"
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
msgstr "Transaction effectuée avec :"
-#: ../output.py:1403
+#: ../output.py:1405
msgid "Downgraded"
msgstr "Rétrogradé"
#. multiple versions installed, both older and newer
-#: ../output.py:1405
+#: ../output.py:1407
msgid "Weird"
msgstr "Bizarre"
-#: ../output.py:1407
+#: ../output.py:1409
msgid "Packages Altered:"
msgstr "Paquets modifiés :"
-#: ../output.py:1475
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Erreur : %s"
+
+#: ../output.py:1489
msgid "Last day"
msgstr "Dernier jour"
-#: ../output.py:1476
+#: ../output.py:1490
msgid "Last week"
msgstr "Dernière semaine"
-#: ../output.py:1477
+#: ../output.py:1491
msgid "Last 2 weeks"
msgstr "Deux dernières semaines"
#. US default :p
-#: ../output.py:1478
+#: ../output.py:1492
msgid "Last 3 months"
msgstr "Trois derniers mois"
-#: ../output.py:1479
+#: ../output.py:1493
msgid "Last 6 months"
msgstr "Six derniers mois"
-#: ../output.py:1480
+#: ../output.py:1494
msgid "Last year"
msgstr "L'année dernière"
-#: ../output.py:1481
+#: ../output.py:1495
msgid "Over a year ago"
msgstr "Il y a plus d'un an"
-#: ../output.py:1510
+#: ../output.py:1524
msgid "installed"
msgstr "installé"
-#: ../output.py:1511
+#: ../output.py:1525
msgid "updated"
msgstr "mis à jour"
-#: ../output.py:1512
+#: ../output.py:1526
msgid "obsoleted"
msgstr "obsolète"
-#: ../output.py:1513
+#: ../output.py:1527
msgid "erased"
msgstr "effacé"
-#: ../output.py:1517
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paquet %s.%s %s:%s-%s marqué pour être %s "
-#: ../output.py:1524
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Lancement de la transaction de test"
-#: ../output.py:1529
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
-msgstr "--> Redémarrage de la résolution des dépendances avec les nouveaux changements."
+msgstr ""
+"--> Redémarrage de la résolution des dépendances avec les nouveaux "
+"changements."
-#: ../output.py:1534
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Résolution des dépendances terminée"
-#: ../output.py:1539
-#: ../output.py:1544
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Traitement de la dépendance : %s pour le paquet : %s"
-#: ../output.py:1548
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Dépendance non résolue : %s"
-#: ../output.py:1554
-#: ../output.py:1559
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Traitement du conflit : %s entre en conflit avec %s"
-#: ../output.py:1563
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
-msgstr "--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de patienter."
+msgstr ""
+"--> Peuplement du jeu de transaction avec les paquets sélectionnés. Merci de "
+"patienter."
-#: ../output.py:1567
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "--> Téléchargement de l'en-tête de %s pour l'ajouter à la transaction."
-#: ../utils.py:132
-#: ../yummain.py:42
+#: ../utils.py:137 ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1117,8 +1100,7 @@ msgstr ""
"\n"
"Sortie sur annulation par l'utilisateur"
-#: ../utils.py:138
-#: ../yummain.py:48
+#: ../utils.py:143 ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1128,8 +1110,7 @@ msgstr ""
"\n"
"Sortie suite à une redirection cassée"
-#: ../utils.py:140
-#: ../yummain.py:50
+#: ../utils.py:145 ../yummain.py:50
#, python-format
msgid ""
"\n"
@@ -1140,8 +1121,7 @@ msgstr ""
"\n"
"%s"
-#: ../utils.py:179
-#: ../yummain.py:273
+#: ../utils.py:184 ../yummain.py:273
msgid "Complete!"
msgstr "Terminé !"
@@ -1153,7 +1133,8 @@ msgstr "Vous devez être super-utilisateur pour lancer cette commande."
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
-"However, you do not have any GPG public keys installed. You need to download\n"
+"However, you do not have any GPG public keys installed. You need to "
+"download\n"
"the keys for packages you wish to install and install them.\n"
"You can do that by running the command:\n"
" rpm --import public.gpg.key\n"
@@ -1166,18 +1147,22 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
"\n"
-"Vous avez activé la vérification des paquets via clés GPG. C'est une bonne chose. \n"
-"Cependant, vous n'avez aucune clé GPG publique installée. Vous devez télécharger\n"
+"Vous avez activé la vérification des paquets via clés GPG. C'est une bonne "
+"chose. \n"
+"Cependant, vous n'avez aucune clé GPG publique installée. Vous devez "
+"télécharger\n"
"et installer les clés pour les paquets que vous souhaitez installer..\n"
"Vous pouvez le faire en lançant la commande :\n"
" rpm --import public.gpg.key\n"
"\n"
"\n"
-"Alternativement, vous pouvez spécifier l'URL de la clé que vous souhaitez utiliser\n"
+"Alternativement, vous pouvez spécifier l'URL de la clé que vous souhaitez "
+"utiliser\n"
"pour un dépôt dans l'option 'gpgkey' dans une section du dépôt et yum\n"
"l'installera pour vous.\n"
"\n"
-"Pour plus de renseignements, contactez le fournisseur de paquets de votre distribution.\n"
+"Pour plus de renseignements, contactez le fournisseur de paquets de votre "
+"distribution.\n"
#: ../yumcommands.py:69
#, python-format
@@ -1265,9 +1250,7 @@ msgid "Updated Packages"
msgstr "Paquets mis à jour"
#. This only happens in verbose mode
-#: ../yumcommands.py:319
-#: ../yumcommands.py:326
-#: ../yumcommands.py:603
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Obsolescence des paquets"
@@ -1395,13 +1378,11 @@ msgstr "Recherche de dépendances :"
msgid "Display the configured software repositories"
msgstr "Affiche les dépôts logiciels configurés"
-#: ../yumcommands.py:810
-#: ../yumcommands.py:811
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "activé"
-#: ../yumcommands.py:819
-#: ../yumcommands.py:820
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "désactivé"
@@ -1457,8 +1438,7 @@ msgstr " Mis à jour : "
msgid "Repo-mirrors : "
msgstr "Miroirs du dépôt :"
-#: ../yumcommands.py:882
-#: ../yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr "Inconnu"
@@ -1491,14 +1471,11 @@ msgstr "Inclus au dépôt :"
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:912
-#: ../yumcommands.py:938
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "id du dépôt"
-#: ../yumcommands.py:926
-#: ../yumcommands.py:927
-#: ../yumcommands.py:941
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "statut"
@@ -1637,17 +1614,18 @@ msgid " State : %s, pid: %d"
msgstr " État : %s, pid : %d"
#: ../yummain.py:173
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Une autre application verrouille actuellement l'utilisation de yum ; attente de déverrouillage..."
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
+msgstr ""
+"Une autre application verrouille actuellement l'utilisation de yum ; attente "
+"de déverrouillage..."
-#: ../yummain.py:201
-#: ../yummain.py:240
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Erreur : %s"
-#: ../yummain.py:211
-#: ../yummain.py:253
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Erreur(s) inconnue(s) : Code de sortie : %d :"
@@ -1659,7 +1637,8 @@ msgstr "Résolution des dépendances"
#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
-msgstr " Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème"
+msgstr ""
+" Vous pouvez essayer d'utiliser --skip-broken pour contourner le problème"
#: ../yummain.py:243
msgid ""
@@ -1689,158 +1668,159 @@ msgstr ""
"\n"
"Sortie sur annulation par l'utilisateur."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() sera supprimé dans une future version de Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Mise en place de l'ensemble des transactions avant configuration"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "tsflag invalide dans le fichier de configuration : %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Recherche dans le regroupement pour la dépendance : %s"
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Correspondance potentielle pour %s depuis %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Correspondance %s trouvée pour %s "
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Membre : %s"
-#: ../yum/depsolve.py:239
-#: ../yum/depsolve.py:749
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s converti pour installation"
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Ajout du paquet %s en mode %s"
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Suppression du paquet %s"
-#: ../yum/depsolve.py:278
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s requiert : %s"
-#: ../yum/depsolve.py:336
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Le prérequis a déjà été trouvé, on triche"
-#: ../yum/depsolve.py:346
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Le prérequis n'est pas un nom de paquet. Recherche de : %s "
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Fournisseur potentiel : %s"
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Le mode est %s pour le fournisseur de %s : %s"
-#: ../yum/depsolve.py:380
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Mode pour le paquet qui fournit %s : %s"
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO : le paquet %s requiert la suppression de %s"
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO : Obsolescence de %s avec %s pour résoudre les dépendances."
-#: ../yum/depsolve.py:400
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO : Mise à jour de %s pour la résolution des dépendances."
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
-msgstr "Impossible de trouver un chemin de mise à jour pour la dépendance de : %s"
+msgstr ""
+"Impossible de trouver un chemin de mise à jour pour la dépendance de : %s"
-#: ../yum/depsolve.py:418
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Impossible de résoudre le prérequis %s pour %s"
-#: ../yum/depsolve.py:441
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Correspondance %s trouvée pour %s "
#. is it already installed?
-#: ../yum/depsolve.py:483
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s est dans les paquets fournis mais est déjà installé, suppression."
-#: ../yum/depsolve.py:499
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
-msgstr "ts contient une version plus récente du paquet %s susceptible de résoudre la dépendance."
+msgstr ""
+"ts contient une version plus récente du paquet %s susceptible de résoudre la "
+"dépendance."
-#: ../yum/depsolve.py:510
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
-msgstr "Le paquet susceptible de résoudre la dépedence %s est déjà installé dans une version plus récente."
+msgstr ""
+"Le paquet susceptible de résoudre la dépedence %s est déjà installé dans une "
+"version plus récente."
-#: ../yum/depsolve.py:518
-#: ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Dépendance manquante : %s est requis par le paquet %s"
-#: ../yum/depsolve.py:531
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s déjà dans ts, omission de celui-ci"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO : Sélection de %s pour mise à jour de %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO : Sélection de %s pour installation de %s"
-#: ../yum/depsolve.py:685
-#: ../yum/depsolve.py:767
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Succès - transaction vide"
-#: ../yum/depsolve.py:724
-#: ../yum/depsolve.py:739
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Re-démarrage de la boucle"
@@ -1872,8 +1852,7 @@ msgstr "recherche de %s comme prérequis de %s"
msgid "Running compare_providers() for %s"
msgstr "Lancement de compare_providers() pour %s"
-#: ../yum/depsolve.py:1041
-#: ../yum/depsolve.py:1047
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "meilleure architecture dans l'objet paquet %s"
@@ -1914,7 +1893,9 @@ msgstr "doConfigSetup() sera supprimé dans une future version de Yum.\n"
#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
-msgstr "Il manque le nom du dépôt %r dans la configuration, utilisation de l'identifiant"
+msgstr ""
+"Il manque le nom du dépôt %r dans la configuration, utilisation de "
+"l'identifiant"
#: ../yum/__init__.py:450
msgid "plugins already initialised"
@@ -1989,8 +1970,12 @@ msgid "The program %s%s%s is found in the yum-utils package."
msgstr "Le programme %s%s%s est présent dans le paquet yum-utils."
#: ../yum/__init__.py:785
-msgid "There are unfinished transactions remaining. You might consider running yum-complete-transaction first to finish them."
-msgstr "Il reste des transactions non terminées. Vous devriez envisager de lancer de yum-complete-transaction pour les terminer."
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+"Il reste des transactions non terminées. Vous devriez envisager de lancer de "
+"yum-complete-transaction pour les terminer."
#: ../yum/__init__.py:853
#, python-format
@@ -2015,71 +2000,74 @@ msgstr ""
msgid " %s from %s"
msgstr " %s depuis %s"
-#: ../yum/__init__.py:1076
-msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
-msgstr "Attention : scriptlet ou autres erreurs non fatales pendant la transaction."
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+"Attention : scriptlet ou autres erreurs non fatales pendant la transaction."
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Échec de la suppression du fichier de transaction %s"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1123
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s est censé être installé, mais ne l'est pas !"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1162
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s est censé être supprimé, mais ne l'est pas !"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Impossible de vérifier si le PID %s est actif"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1286
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Verrou %s existant : une autre copie est lancée avec le pid %s."
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1321
+#: ../yum/__init__.py:1328
#, python-format
msgid "Could not create lock at %s: %s "
msgstr "Impossible de créer le verrou sur %s : %s"
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Le paquet ne correspond pas au téléchargement attendu"
-#: ../yum/__init__.py:1381
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Ne peut procéder à la vérification des sommes de contrôle"
-#: ../yum/__init__.py:1384
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Le paquet ne correspond pas à sa somme de contrôle"
-#: ../yum/__init__.py:1426
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
-msgstr "Le paquet ne correspond pas à la somme de contrôle mais le cache est activé pour %s"
+msgstr ""
+"Le paquet ne correspond pas à la somme de contrôle mais le cache est activé "
+"pour %s"
-#: ../yum/__init__.py:1429
-#: ../yum/__init__.py:1458
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "utilisation de la copie locale de %s"
-#: ../yum/__init__.py:1470
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -2090,411 +2078,409 @@ msgstr ""
" * libre %s\n"
" * nécessaire %s"
-#: ../yum/__init__.py:1519
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "L'en-tête est incomplet."
-#: ../yum/__init__.py:1556
+#: ../yum/__init__.py:1563
#, python-format
-msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
-msgstr "L'en-tête n'est pas dans le cache et le mode cache uniquement est activé. Impossible de télécharger %s"
+msgid ""
+"Header not in local cache and caching-only mode enabled. Cannot download %s"
+msgstr ""
+"L'en-tête n'est pas dans le cache et le mode cache uniquement est activé. "
+"Impossible de télécharger %s"
-#: ../yum/__init__.py:1611
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "La clé publique pour %s n'est pas installée"
-#: ../yum/__init__.py:1615
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problème à l'ouverture du paquet %s"
-#: ../yum/__init__.py:1623
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "La clé publique pour %s n'est pas de confiance"
-#: ../yum/__init__.py:1627
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Le paquet %s n'est pas signé"
-#: ../yum/__init__.py:1665
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Impossible de supprimer %s"
-#: ../yum/__init__.py:1669
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s supprimé"
-#: ../yum/__init__.py:1705
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Impossible de supprimer depuis %s le fichier %s"
-#: ../yum/__init__.py:1709
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "fichier de %s : %s supprimé"
-#: ../yum/__init__.py:1711
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d fichiers de %s supprimés"
-#: ../yum/__init__.py:1780
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Plus d'une correspondance identique dans le regroupement pour %s"
-#: ../yum/__init__.py:1786
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Rien ne correspond à %s.%s %s:%s-%s dans la mise à jour"
-#: ../yum/__init__.py:2019
-msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
-msgstr "searchPackages() sera supprimé dans une future version de Yum. Utilisez searchGenerator() à la place. \n"
+#: ../yum/__init__.py:2026
+msgid ""
+"searchPackages() will go away in a future version of "
+"Yum. Use searchGenerator() instead. \n"
+msgstr ""
+"searchPackages() sera supprimé dans une future version de "
+"Yum. Utilisez searchGenerator() à la place. \n"
-#: ../yum/__init__.py:2058
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Recherche de %d paquets"
-#: ../yum/__init__.py:2062
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "recherche du paquet %s"
-#: ../yum/__init__.py:2074
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "recherche dans les entrées de fichiers"
-#: ../yum/__init__.py:2081
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "recherche dans les entrées de correspondance"
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Correspondance fournie : %s"
-#: ../yum/__init__.py:2163
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Aucune donnée sur les groupes disponible pour les dépôts configurés"
-#: ../yum/__init__.py:2194
-#: ../yum/__init__.py:2213
-#: ../yum/__init__.py:2244
-#: ../yum/__init__.py:2250
-#: ../yum/__init__.py:2329
-#: ../yum/__init__.py:2333
-#: ../yum/__init__.py:2648
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Aucun groupe nommé %s n'existe"
-#: ../yum/__init__.py:2225
-#: ../yum/__init__.py:2346
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "le paquet %s n'a pas été marqué dans le groupe %s"
-#: ../yum/__init__.py:2272
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Ajout du paquet %s pour le groupe %s"
-#: ../yum/__init__.py:2276
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Aucun paquet nommé %s n'est disponible pour installation"
-#: ../yum/__init__.py:2373
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Impossible de trouver le tuple de paquet %s dans le regroupement"
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:2399
#, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr "Impossible de trouver le tuple de paquet %s dans rpmdb"
-#: ../yum/__init__.py:2448
-#: ../yum/__init__.py:2498
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Drapeau de version invalide"
-#: ../yum/__init__.py:2468
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Aucun paquet trouvé pour %s"
-#: ../yum/__init__.py:2689
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "L'objet paquet n'était pas une instance correcte d'objet paquet"
-#: ../yum/__init__.py:2693
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Rien de spécifié pour installation"
# Aucune idée
-#: ../yum/__init__.py:2709
-#: ../yum/__init__.py:3473
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
-msgstr "Recherche de correspondance virtuelle ou de correspondance fichier pour %s"
+msgstr ""
+"Recherche de correspondance virtuelle ou de correspondance fichier pour %s"
-#: ../yum/__init__.py:2715
-#: ../yum/__init__.py:3022
-#: ../yum/__init__.py:3189
-#: ../yum/__init__.py:3479
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Aucune correspondance pour l'argument : %s"
-#: ../yum/__init__.py:2791
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Le paquet %s est installé et n'est pas disponible"
-#: ../yum/__init__.py:2794
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Aucun paquet disponible pour installation"
-#: ../yum/__init__.py:2806
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Paquet : %s - déjà dans le jeu de transaction"
-#: ../yum/__init__.py:2832
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "Le paquet %s est rendu obsolète par %s qui est déjà installé"
-#: ../yum/__init__.py:2835
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
-msgstr "Le paquet %s est rendu obsolète par %s, tentative d'installation de %s à la place"
+msgstr ""
+"Le paquet %s est rendu obsolète par %s, tentative d'installation de %s à la "
+"place"
-#: ../yum/__init__.py:2843
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Le paquet %s est déjà installé dans sa dernière version"
-#: ../yum/__init__.py:2857
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
-msgstr "Le paquet qui correspond à %s est déjà installé. Recherche d'une mise à jour."
+msgstr ""
+"Le paquet qui correspond à %s est déjà installé. Recherche d'une mise à jour."
#. update everything (the easy case)
-#: ../yum/__init__.py:2951
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Mise à jour complète"
-#: ../yum/__init__.py:2972
-#: ../yum/__init__.py:3087
-#: ../yum/__init__.py:3116
-#: ../yum/__init__.py:3143
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr "Pas de mise à jour des paquets qui ont déjà été rendus obsolètes : %s.%s %s:%s-%s"
+msgstr ""
+"Pas de mise à jour des paquets qui ont déjà été rendus obsolètes : %s.%s %s:%"
+"s-%s"
-#: ../yum/__init__.py:3007
-#: ../yum/__init__.py:3186
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3078
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Paquet déjà rendu obsolète : %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3111
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Pas de mise à jour du paquet qui est obsolète : %s"
-#: ../yum/__init__.py:3120
-#: ../yum/__init__.py:3147
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
-msgstr "Pas de mise à jour des paquets qui ont déjà été mis à jour : %s.%s %s:%s-%s"
+msgstr ""
+"Pas de mise à jour des paquets qui ont déjà été mis à jour : %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3202
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Aucun paquet sélectionné pour suppression"
-#: ../yum/__init__.py:3235
-#: ../yum/__init__.py:3339
-#: ../yum/__init__.py:3428
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Impossible d'ouvrir le fichier : %s. Omission."
-#: ../yum/__init__.py:3238
-#: ../yum/__init__.py:3342
-#: ../yum/__init__.py:3431
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Examen de %s : %s"
-#: ../yum/__init__.py:3246
-#: ../yum/__init__.py:3345
-#: ../yum/__init__.py:3434
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
-msgstr "Impossible d'ajouter le paquet %s à la transaction. Architecture incompatible : %s"
+msgstr ""
+"Impossible d'ajouter le paquet %s à la transaction. Architecture "
+"incompatible : %s"
-#: ../yum/__init__.py:3254
+#: ../yum/__init__.py:3270
#, python-format
-msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
-msgstr "Le paquet %s n'est pas installé, il est impossible de le mettre à jour. Lancez plutôt yum install pour l'installer."
+msgid ""
+"Package %s not installed, cannot update it. Run yum install to install it "
+"instead."
+msgstr ""
+"Le paquet %s n'est pas installé, il est impossible de le mettre à jour. "
+"Lancez plutôt yum install pour l'installer."
-#: ../yum/__init__.py:3289
-#: ../yum/__init__.py:3356
-#: ../yum/__init__.py:3445
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Exclusion de %s"
-#: ../yum/__init__.py:3294
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Sélection de %s pour installation "
-#: ../yum/__init__.py:3300
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Sélection de %s pour mise à jour de %s"
-#: ../yum/__init__.py:3307
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s : ne met pas à jour le paquet installé."
-#: ../yum/__init__.py:3375
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
-msgstr "Problème dans la ré-installation : aucun paquet correspondant à supprimer"
+msgstr ""
+"Problème dans la ré-installation : aucun paquet correspondant à supprimer"
# Je suis pas sûr d'avoir bien compris la chaîne originale
-#: ../yum/__init__.py:3388
-#: ../yum/__init__.py:3507
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Le paquet %s autorise des installations multiples, omission"
-#: ../yum/__init__.py:3409
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
-msgstr "Problème dans la ré-installation : aucun paquet %s correspondant à installer"
+msgstr ""
+"Problème dans la ré-installation : aucun paquet %s correspondant à installer"
-#: ../yum/__init__.py:3499
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Aucun paquet disponible pour rétrogradation"
-#: ../yum/__init__.py:3543
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Aucune correspondance pour le paquet disponible : %s"
-#: ../yum/__init__.py:3549
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Mise à niveau uniquement disponible pour le paquet : %s"
-#: ../yum/__init__.py:3617
-#: ../yum/__init__.py:3654
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
#, python-format
msgid "Failed to downgrade: %s"
msgstr "Échec lors du lors du retour à la version précédente : %s"
-#: ../yum/__init__.py:3686
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Récupération de la clé GPG depuis %s"
-#: ../yum/__init__.py:3706
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Échec de la récupération de la clé GPG : "
-#: ../yum/__init__.py:3717
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Échec d'analyse de la clé GPG : la clé n'a pas de valeur %s"
-#: ../yum/__init__.py:3749
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "La clé GPG %s (0x%s) est déjà installée"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3754
-#: ../yum/__init__.py:3816
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Import de la clé GPG 0x%s « %s » depuis %s"
-#: ../yum/__init__.py:3771
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "N'installe pas la clé"
-#: ../yum/__init__.py:3777
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "L'import de la clé à échoué (code %d)"
-#: ../yum/__init__.py:3778
-#: ../yum/__init__.py:3837
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "La clé a été importée avec succès"
-#: ../yum/__init__.py:3783
-#: ../yum/__init__.py:3842
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
-"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
+"The GPG keys listed for the \"%s\" repository are already installed but they "
+"are not correct for this package.\n"
"Check that the correct key URLs are configured for this repository."
msgstr ""
-"Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont incorrectes pour ce paquet.\n"
+"Les clés GPG listées pour le dépôt « %s » sont déjà installées mais sont "
+"incorrectes pour ce paquet.\n"
"Vérifiez que les URL des clés pour ce dépôt soient correctes."
-#: ../yum/__init__.py:3792
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
-msgstr "L'import de la (des) clé(s) n'a pas résolu le problème, mauvaise(s) clé(s) ?"
+msgstr ""
+"L'import de la (des) clé(s) n'a pas résolu le problème, mauvaise(s) clé(s) ?"
-#: ../yum/__init__.py:3811
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "La clé GPG %s (0x%s) est déjà importée"
-#: ../yum/__init__.py:3831
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "N'installe pas la clé pour le dépôt %s"
-#: ../yum/__init__.py:3836
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "L'import de la clé à échoué"
-#: ../yum/__init__.py:3958
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Impossible de trouver un miroir adapté."
-#: ../yum/__init__.py:3960
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Des erreurs ont été rencontrée durant le téléchargement des paquets."
-#: ../yum/__init__.py:4010
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Veuillez reporter cette erreur dans %s"
-#: ../yum/__init__.py:4034
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Erreurs de la transaction de test : "
@@ -2503,8 +2489,7 @@ msgstr "Erreurs de la transaction de test : "
msgid "Loaded plugins: "
msgstr "Modules complémentaires chargés : "
-#: ../yum/plugins.py:216
-#: ../yum/plugins.py:222
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr "Aucun plugin correspondant pour : %s"
@@ -2523,12 +2508,14 @@ msgstr "L'extension « %s » ne peut pas être importé"
#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
-msgstr "Le module complémentaire « %s » ne spécifie pas la version de l'API requise"
+msgstr ""
+"Le module complémentaire « %s » ne spécifie pas la version de l'API requise"
#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
-msgstr "Le module complémentaire « %s » requiert l'API %s. L'API supportée est %s."
+msgstr ""
+"Le module complémentaire « %s » requiert l'API %s. L'API supportée est %s."
#: ../yum/plugins.py:309
#, python-format
@@ -2537,8 +2524,11 @@ msgstr "Chargement du module complémentaire « %s »"
#: ../yum/plugins.py:316
#, python-format
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
-msgstr "Au moins deux modules complémentaires avec le même nom « %s » existent dans le chemin de recherche des modules complémentaires"
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+"Au moins deux modules complémentaires avec le même nom « %s » existent dans "
+"le chemin de recherche des modules complémentaires"
#: ../yum/plugins.py:336
#, python-format
@@ -2550,7 +2540,9 @@ msgstr "Fichier de configuration %s non trouvé"
#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
-msgstr "Impossible de trouver le fichier de configuration pour le module complémentaire %s"
+msgstr ""
+"Impossible de trouver le fichier de configuration pour le module "
+"complémentaire %s"
#: ../yum/plugins.py:501
msgid "registration of commands not supported"
@@ -2572,16 +2564,15 @@ msgstr "Échec du contrôle MD5 pour le RPM %s"
#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "Impossible de lire la base de données RPM. Peut être est-elle déjà utilisée ?"
+msgstr ""
+"Impossible de lire la base de données RPM. Peut être est-elle déjà utilisée ?"
#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Un en-tête vide a été reçu, quelque chose s'est mal passé"
-#: ../rpmUtils/oldUtils.py:253
-#: ../rpmUtils/oldUtils.py:260
-#: ../rpmUtils/oldUtils.py:263
-#: ../rpmUtils/oldUtils.py:266
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "En-tête endommagé %s"
@@ -2593,6 +2584,7 @@ msgstr "Erreur d'ouverture du rpm %s - erreur %s"
#~ msgid "Matching packages for package list to user args"
#~ msgstr "Liste des paquets correspondant à la demande de l'utilisateur"
+
#~ msgid ""
#~ "\n"
#~ "Transaction Summary\n"
@@ -2607,32 +2599,41 @@ msgstr "Erreur d'ouverture du rpm %s - erreur %s"
#~ "Installation %5.5s paquet(s) \n"
#~ "Mise à jour %5.5s paquet(s) \n"
#~ "Suppression %5.5s paquet(s) \n"
+
#~ msgid "excluding for cost: %s from %s"
#~ msgstr "exclusion pour coût : %s depuis %s"
+
#~ msgid "Excluding Packages in global exclude list"
#~ msgstr "Exclusion des paquets de la liste globale d'exclusion"
+
#~ msgid "Excluding Packages from %s"
#~ msgstr "Exclusion des paquets depuis %s"
+
#~ msgid "Reducing %s to included packages only"
#~ msgstr "Réduction de %s aux paquets inclus uniquement"
+
#~ msgid "Keeping included package %s"
#~ msgstr "Conservation du paquet inclus %s"
+
#~ msgid "Removing unmatched package %s"
#~ msgstr "Suppression du paquet non concordant %s"
+
#~ msgid "Finished"
#~ msgstr "Terminé"
+
#~ msgid ""
#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
#~ "().\n"
#~ msgstr ""
#~ "getInstalledPackageObject() sera supprimé, utilisez self.rpmdb."
#~ "searchPkgTuple().\n"
+
#~ msgid "Parsing package install arguments"
#~ msgstr "Traitement des options d'installation des paquets"
#, fuzzy
#~ msgid "po %s obsoletes best: %s"
#~ msgstr "%s rend obsolète %s"
+
#~ msgid "Invalid versioned dependency string, try quoting it."
#~ msgstr "Chaîne de version de dépendance invalide, essai entre guillemets."
-
diff --git a/po/it.po b/po/it.po
index 53925a5..a6c8f13 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum-it 3.2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 21:32+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-03-06 11:41+0100\n"
"Last-Translator: mario_santagiuliana <mario@marionline.it>\n"
"Language-Team: Italian <fedora-trans-it@redhat.com>\n"
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../callback.py:48 ../output.py:922 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Aggiornamento"
@@ -30,7 +30,7 @@ msgstr "Aggiornamento"
msgid "Erasing"
msgstr "Cancellazione"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:921
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installazione"
@@ -39,15 +39,16 @@ msgstr "Installazione"
msgid "Obsoleted"
msgstr "Reso obsoleto"
-#: ../callback.py:54 ../output.py:1029
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Aggiornato"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Cancellato"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1027
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Installato"
@@ -69,7 +70,7 @@ msgstr "Errore: stato di output non valido: %s per %s"
msgid "Erased: %s"
msgstr "Cancellato: %s"
-#: ../callback.py:217 ../output.py:923
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Rimozione in corso"
@@ -77,58 +78,60 @@ msgstr "Rimozione in corso"
msgid "Cleanup"
msgstr "Pulizia"
-#: ../cli.py:105
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Comando \"%s\" già definito"
-#: ../cli.py:117
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Settaggio repository"
-#: ../cli.py:128
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Lettura dei metadati dei repository dai file locali"
-#: ../cli.py:191 ../utils.py:79
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Errore di configurazione: %s"
-#: ../cli.py:194 ../cli.py:1189 ../utils.py:82
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Errore opzioni: %s"
-#: ../cli.py:222
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Installato: %s-%s da %s"
-#: ../cli.py:224, python-format
+#: ../cli.py:225
+#, python-format
msgid " Built : %s at %s"
msgstr " Costruito : %s da %s"
-#: ../cli.py:226, python-format
+#: ../cli.py:227
+#, python-format
msgid " Committed: %s at %s"
msgstr " Committed: %s da %s"
-#: ../cli.py:265
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "È necessario dare qualche comando"
-#: ../cli.py:308
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Requisiti su disco:\n"
-#: ../cli.py:310
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Almeno %dMB necessari sul filesystem %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:315
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -136,55 +139,64 @@ msgstr ""
"Riepilogo errori\n"
"-------------\n"
-#: ../cli.py:358
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "La transazione non contiene alcuna operazione da eseguire."
-#: ../cli.py:394
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Uscita richiesta dall'utente"
-#: ../cli.py:398
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Download dei pacchetti:"
-#: ../cli.py:403
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Errore nel download dei pacchetti:\n"
-#: ../cli.py:417 ../yum/__init__.py:3344
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Esecuzione rpm_check_debug"
-#: ../cli.py:420 ../yum/__init__.py:3347
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "ERRORE con rpm_check_debug su depsolve:"
-#: ../cli.py:424, python-format
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
+#, python-format
msgid "Please report this error in %s"
msgstr "Riportare questo errore in %s"
-#: ../cli.py:430
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Test di transazione in corso"
-#: ../cli.py:446
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Test di transazione terminato"
-#: ../cli.py:448
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Errore nel controllo transazione:\n"
-#: ../cli.py:455
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Test di transazione eseguito con successo"
-#: ../cli.py:476
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Transazione in corso"
-#: ../cli.py:506
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -193,169 +205,192 @@ msgstr ""
"interattiva.\n"
"Usare \"-y\" per abilitarla."
-#: ../cli.py:525 ../cli.py:559
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Forse si intendeva: "
-#: ../cli.py:542 ../cli.py:550, python-format
+#: ../cli.py:555 ../cli.py:563
+#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Pacchetto(i) %s%s%s disponibili ma non installati."
-#: ../cli.py:556 ../cli.py:589, python-format
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
+#, python-format
msgid "No package %s%s%s available."
msgstr "Nessun pacchetto %s%s%s disponibile."
-#: ../cli.py:594 ../cli.py:669 ../yumcommands.py:1010
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Pacchetto(i) da installare"
-#: ../cli.py:595 ../cli.py:670 ../yumcommands.py:159 ../yumcommands.py:1011
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Niente da fare"
-#: ../cli.py:628
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pacchetti marcati per l'aggiornamento"
-#: ../cli.py:631
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Nessun pacchetto marcato per l'aggiornamento"
-#: ../cli.py:645
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pacchetti marcati per la rimozione"
-#: ../cli.py:648
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Nessun pacchetto marcato per la rimozione"
-#: ../cli.py:660
+#: ../cli.py:683
+#, fuzzy
+msgid "Package(s) to downgrade"
+msgstr "Pacchetto(i) da installare"
+
+#: ../cli.py:707
+#, fuzzy, python-format
+msgid " (from %s)"
+msgstr " %s da %s"
+
+#: ../cli.py:709
+#, fuzzy, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Nessun pacchetto %s%s%s disponibile."
+
+#: ../cli.py:716
+#, fuzzy
+msgid "Package(s) to reinstall"
+msgstr "Pacchetto(i) da installare"
+
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Nessun pacchetto fornito"
-#: ../cli.py:715
-msgid "Matching packages for package list to user args"
-msgstr ""
-"Ricerca corrispondenza degli argomenti dell'utente nella lista dei pacchetti"
-
-#: ../cli.py:764, python-format
+#: ../cli.py:813
+#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Attenzione: Nessun pacchetto trovato per %s"
-#: ../cli.py:767
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Nessuna corrispondenza trovata"
-#: ../cli.py:806
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-"Attenzione: la versione 3.0.x di yum non fa match correttamente sui filenames."
-"\n"
+"Attenzione: la versione 3.0.x di yum non fa match correttamente sui "
+"filenames.\n"
" Si può usare \"%s*/%s%s\" e/o \"%s*bin/%s%s\" per avere questo comportamento"
-#: ../cli.py:822
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Nessun pacchetto trovato per %s"
-#: ../cli.py:834
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Pulizia completa"
-#: ../cli.py:848
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Pulizia headers"
-#: ../cli.py:851
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Pulizia pacchetti"
-#: ../cli.py:854
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Pulizia metadati xml"
-#: ../cli.py:857
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Pulizia database cache"
-#: ../cli.py:860
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Pulizia metadati expire-cache"
-#: ../cli.py:863
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Pulizia plugins"
-#: ../cli.py:888
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Gruppi installati:"
-#: ../cli.py:895
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Gruppi disponibili:"
-#: ../cli.py:901
+#: ../cli.py:959
msgid "Done"
msgstr "Fatto"
-#: ../cli.py:912 ../cli.py:930 ../cli.py:936 ../yum/__init__.py:2386
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Attenzione: Il gruppo %s non esiste."
-#: ../cli.py:940
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Nessun pacchetto in alcun gruppo richiesto è disponibile per l'installazione "
"o l'aggiornamento"
-#: ../cli.py:942
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pacchetto(i) da installare"
-#: ../cli.py:952 ../yum/__init__.py:2398
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Non esiste nessun gruppo di nome %s"
-#: ../cli.py:958
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Nessun pacchetto da rimuovere dai gruppi"
-#: ../cli.py:960
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pacchetto(i) da rimuovere"
-#: ../cli.py:1002
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Il pacchetto %s è già installato, lo salto"
-#: ../cli.py:1013
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Escludendo il pacchetto non comparabile %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1039
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Nessun altro %s installato, inserimento in lista per potenziale installazione"
-#: ../cli.py:1058
+#: ../cli.py:1117
+msgid "Plugin Options"
+msgstr ""
+
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Errore di linea di comando: %s"
-#: ../cli.py:1071
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -366,249 +401,258 @@ msgstr ""
"\n"
"%s: l'opzione %s richiede un argomento"
-#: ../cli.py:1129
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color deve specificare uno tra: auto, always, never"
-#: ../cli.py:1231
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "mostra questo messaggio di aiuto ed esce"
-#: ../cli.py:1235
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "tollera gli errori"
-#: ../cli.py:1237
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "esecuzione esclusivamente in cache, senza aggiornarla"
-#: ../cli.py:1239
+#: ../cli.py:1306
msgid "config file location"
msgstr "configurazione locazione dei file"
-#: ../cli.py:1241
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "tempo di attesa comando massima"
-#: ../cli.py:1243
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "livello output di debug"
-#: ../cli.py:1247
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "Mostra comandi duplicati, nei repo, in lista/cerca"
-#: ../cli.py:1249
+#: ../cli.py:1316
msgid "error output level"
msgstr "livello output per gli errori"
-#: ../cli.py:1252
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "modalità silenziosa"
-#: ../cli.py:1254
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "mostra più messaggi di log"
-#: ../cli.py:1256
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "risponde si a tutte le domande"
-#: ../cli.py:1258
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "mostra la versione di Yum e esce"
-#: ../cli.py:1259
+#: ../cli.py:1326
msgid "set install root"
msgstr "imposta il percorso d'installazione"
-#: ../cli.py:1263
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "abilita uno o più repository (wildcard consentite)"
-#: ../cli.py:1267
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "disabilita uno o più repository (wildcard·consentite)"
-#: ../cli.py:1270
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "esclude pacchetto(i) per nome o glob"
-#: ../cli.py:1272
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "disabilita l'esclusione dal main, per un repo o per tutto"
-#: ../cli.py:1275
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "abilita l'elaborazione degli obsoleti durante l'aggiornamento"
-#: ../cli.py:1277
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "disabilita i plugin di Yum"
-#: ../cli.py:1279
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "disabilita il controllo della firma gpg"
-#: ../cli.py:1281
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "disabilita i plugin per nome"
-#: ../cli.py:1284
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "abilita i plugin per nome"
-#: ../cli.py:1287
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "Salto pacchetti con problemi di risoluzione dipendenze"
-#: ../cli.py:1289
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "controlla se il colore è usato"
-#: ../output.py:298
+#: ../output.py:305
msgid "Jan"
msgstr "Gen"
-#: ../output.py:298
+#: ../output.py:305
msgid "Feb"
msgstr "Feb"
-#: ../output.py:298
+#: ../output.py:305
msgid "Mar"
msgstr "Mar"
-#: ../output.py:298
+#: ../output.py:305
msgid "Apr"
msgstr "Apr"
-#: ../output.py:298
+#: ../output.py:305
msgid "May"
msgstr "Mag"
-#: ../output.py:298
+#: ../output.py:305
msgid "Jun"
msgstr "Giu"
-#: ../output.py:299
+#: ../output.py:306
msgid "Jul"
msgstr "Lug"
-#: ../output.py:299
+#: ../output.py:306
msgid "Aug"
msgstr "Ago"
-#: ../output.py:299
+#: ../output.py:306
msgid "Sep"
msgstr "Set"
-#: ../output.py:299
+#: ../output.py:306
msgid "Oct"
msgstr "Ott"
-#: ../output.py:299
+#: ../output.py:306
msgid "Nov"
msgstr "Nov"
-#: ../output.py:299
+#: ../output.py:306
msgid "Dec"
msgstr "Dic"
-#: ../output.py:309
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Connessione ad un altro mirror in corso."
-#: ../output.py:525, python-format
+#: ../output.py:538
+#, python-format
msgid "Name : %s%s%s"
msgstr "Nome : %s%s%s"
-#: ../output.py:526
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Arch : %s"
-#: ../output.py:528
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Periodo : %s"
-#: ../output.py:529
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Versione : %s"
-#: ../output.py:530
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Release : %s"
-#: ../output.py:531
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Dimensione : %s"
-#: ../output.py:532
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:534
+#: ../output.py:547
+#, fuzzy, python-format
+msgid "From repo : %s"
+msgstr "Versione : %s"
+
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Committer : %s"
-#: ../output.py:535, python-format
+#: ../output.py:550
+#, python-format
msgid "Committime : %s"
msgstr "Data commit: %s"
-#: ../output.py:536, python-format
+#: ../output.py:551
+#, python-format
msgid "Buildtime : %s"
msgstr "Data build : %s"
-#: ../output.py:538, python-format
+#: ../output.py:553
+#, python-format
msgid "Installtime: %s"
msgstr "Data inst. : %s"
-#: ../output.py:539
+#: ../output.py:554
msgid "Summary : "
msgstr "Sommario : "
-#: ../output.py:541
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:542
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Licenza : %s"
-#: ../output.py:543
+#: ../output.py:558
msgid "Description: "
msgstr "Descrizione: "
-#: ../output.py:611
+#: ../output.py:626
msgid "y"
msgstr "s"
-#: ../output.py:611
+#: ../output.py:626
msgid "yes"
msgstr "si"
-#: ../output.py:612
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:612
+#: ../output.py:627
msgid "no"
msgstr "no"
#
-#: ../output.py:616
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "È corretto [s/N]: "
-#: ../output.py:704
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -617,129 +661,144 @@ msgstr ""
"\n"
"Gruppo: %s"
-#: ../output.py:708, python-format
+#: ../output.py:726
+#, python-format
msgid " Group-Id: %s"
msgstr " Id-Gruppo: %s"
-#: ../output.py:713
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Descrizione: %s"
-#: ../output.py:715
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Pacchetti necessari:"
-#: ../output.py:716
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Pacchetti di default:"
-#: ../output.py:717
+#: ../output.py:735
msgid " Optional Packages:"
msgstr "Pacchetti opzionali:"
-#: ../output.py:718
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Pacchetti condizionali:"
-#: ../output.py:738
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "pacchetto: %s"
-#: ../output.py:740
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Nessuna dipendenza per questo pacchetto"
-#: ../output.py:745
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " dipendenze: %s"
-#: ../output.py:747
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Dipendenza non soddisfatte"
-#: ../output.py:819, python-format
+#: ../output.py:837
+#, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:820
+#: ../output.py:838
msgid "Matched from:"
msgstr "Corrispondenza trovata in:"
-#: ../output.py:828
+#: ../output.py:847
msgid "Description : "
msgstr "Descrizione: "
-#: ../output.py:831, python-format
+#: ../output.py:850
+#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:834, python-format
+#: ../output.py:853
+#, python-format
msgid "License : %s"
msgstr "Licenza : %s"
-#: ../output.py:837, python-format
+#: ../output.py:856
+#, python-format
msgid "Filename : %s"
msgstr "Nome file : %s"
-#: ../output.py:841
+#: ../output.py:860
msgid "Other : "
msgstr "Altro : "
-#: ../output.py:874
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr ""
"Si è verificato un errore nel calcolo della dimensione totale di download"
-#: ../output.py:879
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Dimensione totale: %s"
-#: ../output.py:882
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Dimensione totale del download: %s"
-#: ../output.py:924
+#: ../output.py:942
+#, fuzzy
+msgid "Reinstalling"
+msgstr "Installazione"
+
+#: ../output.py:943
+msgid "Downgrading"
+msgstr ""
+
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Installazioni per dipendenze"
-#: ../output.py:925
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Aggiornamenti per dipendenze"
-#: ../output.py:926
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Rimozioni per dipendenze"
-#: ../output.py:933 ../output.py:1031
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Saltato (problemi di dipendenze):"
-#: ../output.py:954
+#: ../output.py:976
msgid "Package"
msgstr "Pacchetto"
-#: ../output.py:954
+#: ../output.py:976
msgid "Arch"
msgstr "Arch"
-#: ../output.py:955
+#: ../output.py:977
msgid "Version"
msgstr "Versione"
-#: ../output.py:955
+#: ../output.py:977
msgid "Repository"
msgstr "Repository"
-#: ../output.py:956
+#: ../output.py:978
msgid "Size"
msgstr "Dim."
-#: ../output.py:968, python-format
+#: ../output.py:990
+#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
"\n"
@@ -747,135 +806,325 @@ msgstr ""
" in sostituzione di %s%s%s.%s %s\n"
"\n"
-#: ../output.py:977, python-format
+#: ../output.py:999
+#, python-format
msgid ""
"\n"
"Transaction Summary\n"
"%s\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
msgstr ""
-"\n"
-"Riepilogo della transazione\n"
-"%s\n"
-"Installazione di %5.5s Pacchetto(i)\n"
-"Aggiornamento di %5.5s Pacchetto(i)\n"
-"Rimozione di %5.5s Pacchetto(i)\n"
-#: ../output.py:1025
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr "Rimosso"
-#: ../output.py:1026
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Dipendenza rimossa"
-#: ../output.py:1028
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Dipendenza installata"
-#: ../output.py:1030
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Dipendenza aggiornata"
-#: ../output.py:1032
+#: ../output.py:1066
msgid "Replaced"
msgstr "Sostituito"
-#: ../output.py:1033
+#: ../output.py:1067
msgid "Failed"
msgstr "Fallito"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1099
+#: ../output.py:1133
msgid "two"
msgstr "due"
-#: ../output.py:1106
-#, python-format
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
+#, fuzzy, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
"\n"
" Download in corso interrotto, %spremi (ctrl-c) nuovamente%s entro %s%s%s "
"secondi per uscire\n"
-#: ../output.py:1116
+#: ../output.py:1155
msgid "user interrupt"
msgstr "interruzione utente"
-#: ../output.py:1132
+#: ../output.py:1173
msgid "Total"
msgstr "Totale"
-#: ../output.py:1146
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Transazione in corso"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Errore nel controllo transazione:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Altro : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#, fuzzy
+msgid "Return-Code :"
+msgstr "Id-Repo : "
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Reso obsoleto"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Fallito"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Errore nel controllo transazione:\n"
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Nessun pacchetto fornito"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Errore: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "installato"
-#: ../output.py:1147
+#: ../output.py:1525
msgid "updated"
msgstr "aggiornato"
-#: ../output.py:1148
+#: ../output.py:1526
msgid "obsoleted"
msgstr "reso obsoleto"
-#: ../output.py:1149
+#: ../output.py:1527
msgid "erased"
msgstr "cancellato"
-#: ../output.py:1153
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Pacchetto %s.%s %s:%s-%s settato per essere %s"
-#: ../output.py:1160
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Esecuzione del controllo di transazione"
-#: ../output.py:1165
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
-msgstr "--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti."
+msgstr ""
+"--> Riavvio della risoluzione delle dipendenze con i nuovi cambiamenti."
-#: ../output.py:1170
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Risoluzione delle dipendenze terminata"
-#: ../output.py:1175
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Esame delle dipendenze: %s per il pacchetto: %s"
-#: ../output.py:1180
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Dipendenze non risolte: %s"
-#: ../output.py:1186
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Controllo conflitto: %s va in conflitto con %s"
-#: ../output.py:1189
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
"--> Inizializzazione della transazione con i pacchetti selezionati. "
"Attendere prego."
-#: ../output.py:1193
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
"---> Download degli header per %s per impacchettarli nel set di transazione."
-#: ../yumcommands.py:41
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Uscita forzata da utente"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Uscita per broken pipe"
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Completo!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Occorre avere i privilegi di root per eseguire questo comando"
-#: ../yumcommands.py:48
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -909,30 +1158,30 @@ msgstr ""
"Per maggiori informazioni contattare il provider della distribuzione o del "
"pacchetto.\n"
-#: ../yumcommands.py:68
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Errore: Bisogna passare una lista di pkg a %s"
-#: ../yumcommands.py:74
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Errore: richiesto un elemento di corrispondenza"
-#: ../yumcommands.py:80
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Errore: Necessario un gruppo o una lista di gruppi"
-#: ../yumcommands.py:89
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Errore: il comando clean richiede l'opzione: %s"
-#: ../yumcommands.py:94
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Errore: argomento per il comando clean non valido: %r"
-#: ../yumcommands.py:107
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Nessun argomento per la shell"
@@ -974,244 +1223,284 @@ msgstr "Aggiorna uno o più pacchetti nel sistema"
msgid "Setting up Update Process"
msgstr "Impostazione Processo di Aggiornamento"
-#: ../yumcommands.py:243
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Visualizza dettagli su un pacchetto o gruppi di pacchetti"
-#: ../yumcommands.py:292
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Pacchetti installati"
-#: ../yumcommands.py:300
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Pacchetti disponibili"
-#: ../yumcommands.py:304
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Pacchetti extra"
-#: ../yumcommands.py:308
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Pacchetti aggiornati"
#. This only happens in verbose mode
-#: ../yumcommands.py:316 ../yumcommands.py:323 ../yumcommands.py:600
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Pacchetti resi obsoleti"
-#: ../yumcommands.py:325
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Pacchetti aggiunti di recente"
-#: ../yumcommands.py:332
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Nessun pacchetto presente in lista"
-#: ../yumcommands.py:346
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Elenca un pacchetto o un gruppo di pacchetti"
-#: ../yumcommands.py:358
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Rimuove uno o più pacchetti dal sistema"
-#: ../yumcommands.py:365
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Impostazione Processo di Rimozione"
-#: ../yumcommands.py:379
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Settaggio dei processi di gruppo"
-#: ../yumcommands.py:385
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Nessun gruppo sul quale eseguire il comando"
-#: ../yumcommands.py:398
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Elenca i gruppi di pacchetti disponibili"
-#: ../yumcommands.py:415
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Installa i pacchetti di un gruppo nel sistema"
-#: ../yumcommands.py:437
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Rimuove i pacchetti di un gruppo dal sistema"
-#: ../yumcommands.py:464
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Visualizza i dettagli di un gruppo di pacchetti"
-#: ../yumcommands.py:488
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Genera la cache dei metadati"
-#: ../yumcommands.py:494
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Creazione dei file di cache per i metadati."
-#: ../yumcommands.py:495
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
"L'operazione impiegherà del tempo che dipende dalla velocità del computer"
-#: ../yumcommands.py:516
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Cache dei metadata creata"
-#: ../yumcommands.py:530
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Rimuovere i dati nella cache"
-#: ../yumcommands.py:551
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Cerca quale pacchetto fornisce il valore dato"
-#: ../yumcommands.py:571
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti"
-#: ../yumcommands.py:620
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Cerca il termine passato nei dettagli dei pacchetti"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Ricerca dei pacchetti: "
-#: ../yumcommands.py:643
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Aggiornamento pacchetti tenendo conto degli obsoleti"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Impostazione Processo di Aggiornamento del sistema"
-#: ../yumcommands.py:665
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Installa un RPM locale"
-#: ../yumcommands.py:673
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Settaggio processamento pacchetti locali"
-#: ../yumcommands.py:692
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Determina quale pacchetto soddisfa la dipendenza"
-#: ../yumcommands.py:695
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Ricerca dei pacchetti per dipendenze:"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Esegui una shell di yum interattiva"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Impostazione della shell di yum"
-#: ../yumcommands.py:733
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Elenca le dipendenze del pacchetto"
-#: ../yumcommands.py:739
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Ricerca delle dipendenze: "
-#: ../yumcommands.py:755
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Mostra i repository di software configurati"
-#: ../yumcommands.py:803 ../yumcommands.py:804
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "abilitato"
-#: ../yumcommands.py:812 ../yumcommands.py:813
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "disabilitato"
-#: ../yumcommands.py:827
-msgid "Repo-id : "
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
msgstr "Id-Repo : "
-#: ../yumcommands.py:828
-msgid "Repo-name : "
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
msgstr "Nome-Repo : "
-#: ../yumcommands.py:829
-msgid "Repo-status : "
+#: ../yumcommands.py:836
+#, fuzzy
+msgid "Repo-status : "
msgstr "Stato-Repo : "
-#: ../yumcommands.py:831
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Revisione-Repo: "
-#: ../yumcommands.py:835
-msgid "Repo-tags : "
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
msgstr "Repo-tags : "
-#: ../yumcommands.py:841
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Repo-distro-tags: "
-#: ../yumcommands.py:846
-msgid "Repo-updated: "
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
msgstr "Repo-aggiornato: "
-#: ../yumcommands.py:848
-msgid "Repo-pkgs : "
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
msgstr "Repo-pkgs : "
-#: ../yumcommands.py:849
-msgid "Repo-size : "
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
msgstr "Dim.-Repo : "
-#: ../yumcommands.py:856
-msgid "Repo-baseurl: "
+#: ../yumcommands.py:863
+#, fuzzy
+msgid "Repo-baseurl : "
msgstr "Repo-baseurl: "
-#: ../yumcommands.py:860
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Repo-metalink: "
-#: ../yumcommands.py:863
-msgid "Repo-mirrors: "
+#: ../yumcommands.py:875
+#, fuzzy
+msgid " Updated : "
+msgstr "Aggiornato"
+
+#: ../yumcommands.py:878
+#, fuzzy
+msgid "Repo-mirrors : "
msgstr "Repo-mirrors: "
-#: ../yumcommands.py:867
-msgid "Repo-exclude: "
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, fuzzy, python-format
+msgid "Instant (last: %s)"
+msgstr "Data inst. : %s"
+
+#: ../yumcommands.py:893
+#, fuzzy, python-format
+msgid "%s second(s) (last: %s)"
+msgstr "Conflitti di %s: %s"
+
+#: ../yumcommands.py:895
+#, fuzzy
+msgid "Repo-expire : "
+msgstr "Dim.-Repo : "
+
+#: ../yumcommands.py:898
+#, fuzzy
+msgid "Repo-exclude : "
msgstr "Repo-exclude: "
-#: ../yumcommands.py:871
-msgid "Repo-include: "
+#: ../yumcommands.py:902
+#, fuzzy
+msgid "Repo-include : "
msgstr "Repo-include:"
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:881 ../yumcommands.py:907
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "repo id"
-#: ../yumcommands.py:895 ../yumcommands.py:896 ../yumcommands.py:910
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "stato"
-#: ../yumcommands.py:908
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "nome repo"
-#: ../yumcommands.py:934
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Mostra un messaggio utile per l'uso"
-#: ../yumcommands.py:968
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Nessun aiuto disponibile per %s"
-#: ../yumcommands.py:973
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1221,7 +1510,7 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:975
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1231,117 +1520,153 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:1003
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Impostazione Processo di Reinstallazione"
-#: ../yumcommands.py:1017
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "reinstalla un pacchetto"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1060
+#, fuzzy
+msgid "Setting up Downgrade Process"
+msgstr "Impostazione Processo di Aggiornamento del sistema"
+
+#: ../yumcommands.py:1067
+#, fuzzy
+msgid "downgrade a package"
+msgstr "reinstalla un pacchetto"
+
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
msgstr ""
-"\n"
-"\n"
-"Uscita forzata da utente"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
msgstr ""
-"\n"
-"\n"
-"Uscita per broken pipe"
-#: ../yummain.py:124
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " Id-Gruppo: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Pacchetto"
+
+#: ../yumcommands.py:1152
+#, fuzzy
+msgid "Installed:"
+msgstr "Installato"
+
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Installato"
+
+#: ../yumcommands.py:1166
+#, fuzzy
+msgid "Available:"
+msgstr "Gruppi disponibili:"
+
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Gruppi disponibili:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
+
+#: ../yummain.py:128
msgid "Running"
msgstr "In esecuzione"
-#: ../yummain.py:125
+#: ../yummain.py:129
#, fuzzy
msgid "Sleeping"
msgstr "Addormentato"
-#: ../yummain.py:126
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "Non interrompibile"
-#: ../yummain.py:127
+#: ../yummain.py:131
msgid "Zombie"
msgstr "Zombie"
-#: ../yummain.py:128
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr "Tracciato/Fermato"
-#: ../yummain.py:129
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../yummain.py:133
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " L'altra applicazione è: PackageKit"
-#: ../yummain.py:135
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " L'altra applicazione è: %s"
-#: ../yummain.py:138
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Memoria : %5s RSS (%5sB VSZ)"
-#: ../yummain.py:142
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " Partito: %s - %s fa"
-#: ../yummain.py:144
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " Stato : %s, pid: %d"
-#: ../yummain.py:169
-msgid "Another app is currently holding the yum lock; waiting for it to exit..."
+#: ../yummain.py:173
+msgid ""
+"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"Un'altra applicazione sta bloccando l'esecuzione di yum; in attesa che "
"esca..."
-#: ../yummain.py:197 ../yummain.py:236
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Errore: %s"
-#: ../yummain.py:207 ../yummain.py:247
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Errore(i) sconosciuto: Codice di uscita: %d:"
#. Depsolve stage
-#: ../yummain.py:214
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "Risoluzione dipendenze"
-#: ../yummain.py:238
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
msgstr " Si può provare ad usare --skip-broken per aggirare il problema"
-#: ../yummain.py:239
+#: ../yummain.py:243
+#, fuzzy
msgid ""
" You could try running: package-cleanup --problems\n"
-" package-cleanup --dupes"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
msgstr ""
" Provare a lanciare: package-cleanup --problems\n"
" package-cleanup --dupes"
-#: ../yummain.py:253
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1349,11 +1674,7 @@ msgstr ""
"\n"
"Dipendenze risolte"
-#: ../yummain.py:267
-msgid "Complete!"
-msgstr "Completo!"
-
-#: ../yummain.py:314
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1363,138 +1684,141 @@ msgstr ""
"\n"
"Uscita su richiesta utente."
-#: ../yum/depsolve.py:84
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() verrà eliminato in una futura versione di yum.\n"
-#: ../yum/depsolve.py:99
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Settaggio set di transazione prima che sia attivo config class"
-#: ../yum/depsolve.py:150
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "tsflag non valido nel file di configurazione: %s"
-#: ../yum/depsolve.py:161
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Ricerca di pkgSack per dip: %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Corrispondenza potenziale per %s da %s"
-#: ../yum/depsolve.py:192
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Individuato %s come requisito per %s"
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Membro: %s"
-#: ../yum/depsolve.py:247 ../yum/depsolve.py:738
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s convertito in installa"
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Aggiunto il pacchetto %s in modo %s"
-#: ../yum/depsolve.py:264
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Rimozione pacchetto %s"
-#: ../yum/depsolve.py:275
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s richiede: %s"
-#: ../yum/depsolve.py:333
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Il requisito necessario è già stato controllato, imbroglio"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Il requisito necessario non è il nome di un pacchetto. Guardando: %s"
-#: ../yum/depsolve.py:350
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Provider potenziale: %s"
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "La modalità è %s per il provider di %s: %s"
-#: ../yum/depsolve.py:377
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Modalità per la fornitura del pacchetto %s: %s"
-#: ../yum/depsolve.py:381
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: il pacchetto %s richiede che %s sia marcato per la rimozione"
-#: ../yum/depsolve.py:394
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
"TSINFO: Verrà reso obsoleto %s, sostituendolo con %s per risolvere una "
"dipendenza."
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Aggiornamento di %s per risolvere dip."
-#: ../yum/depsolve.py:405
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
-msgstr "Impossibile trovare un percorso di aggiornamento per dipendenze per: %s"
+msgstr ""
+"Impossibile trovare un percorso di aggiornamento per dipendenze per: %s"
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Requisito %s non risolvibile per %s"
-#: ../yum/depsolve.py:438, python-format
+#: ../yum/depsolve.py:440
+#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Individuato %s come requisito per %s"
#. is it already installed?
-#: ../yum/depsolve.py:480
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s è nei pacchetti forniti ma è già installato, Rimozione."
-#: ../yum/depsolve.py:495
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
-msgstr "Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts."
+msgstr ""
+"Potenziale risoluzione del pacchetto %s ha una instanza piu nuova in ts."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
"Potenziale risoluzione del pacchetto %s ha una istanza piu aggiornata "
"installata."
-#: ../yum/depsolve.py:514 ../yum/depsolve.py:563
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Dipendenza mancante: %s è necessario per il pacchetto %s"
-#: ../yum/depsolve.py:527
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s è gia nel set delle transazioni (ts), verrà saltato"
@@ -1509,52 +1833,53 @@ msgstr "TSINFO: %s marcato come update per %s"
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: %s marcato come installa per %s"
-#: ../yum/depsolve.py:674 ../yum/depsolve.py:756
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Successo - transazione vuota"
-#: ../yum/depsolve.py:713 ../yum/depsolve.py:728
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Riavvio del ciclo"
-#: ../yum/depsolve.py:744
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Processo delle dipendenze terminato"
-#: ../yum/depsolve.py:750
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s appartenente a %s ha problemi di dipendenze"
-#: ../yum/depsolve.py:757
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Successo - dipendenze risolte"
-#: ../yum/depsolve.py:771
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Controllo delle dipendenze per %s"
-#: ../yum/depsolve.py:854
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "ricerca di %s come un requisito di %s"
-#: ../yum/depsolve.py:996
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Esecuzione di compare_providers() per %s"
-#: ../yum/depsolve.py:1024 ../yum/depsolve.py:1030
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "migliore architettura in po %s"
-#: ../yum/depsolve.py:1091, python-format
+#: ../yum/depsolve.py:1142
+#, python-format
msgid "%s obsoletes %s"
msgstr "%s rende obsoleto %s"
-#: ../yum/depsolve.py:1107
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1563,115 +1888,122 @@ msgstr ""
"archdist ha comparato %s a %s su %s\n"
" Vincitore: %s"
-#: ../yum/depsolve.py:1114
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "sourcerpm comune %s e %s"
-#: ../yum/depsolve.py:1120
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "prefisso comune di %s tra %s e %s"
-#: ../yum/depsolve.py:1128, python-format
+#: ../yum/depsolve.py:1175
+#, python-format
msgid "Best Order: %s"
msgstr "Ordine migliore: %s"
-#: ../yum/__init__.py:154
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() verrà eliminato in una futura versione di yum.\n"
-#: ../yum/__init__.py:350
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Non è presente il nome nel repository %r, utilizzo l'id"
-#: ../yum/__init__.py:388
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "plugin già inizializzato"
-#: ../yum/__init__.py:395
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() verrà eliminato in una futura versione di yum.\n"
-#: ../yum/__init__.py:406
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Lettura del RPMDB locale"
-#: ../yum/__init__.py:424
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() verrà eliminato in una futura versione di yum.\n"
-#: ../yum/__init__.py:444
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() verrà eliminato in una futura versione di yum.\n"
-#: ../yum/__init__.py:461
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Settaggio pacchetti sack"
-#: ../yum/__init__.py:504
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
-msgstr "l'oggetto repository per il repository %s manca del metodo _resetSack\n"
+msgstr ""
+"l'oggetto repository per il repository %s manca del metodo _resetSack\n"
-#: ../yum/__init__.py:505
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "quindi questo repository non può essere resettato.\n"
-#: ../yum/__init__.py:510
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() verrà eliminato in una futura versione di yum.\n"
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Costruzione oggetto aggiornamenti"
-#: ../yum/__init__.py:553
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() verrà eliminato in una futura versione di Yum.\n"
-#: ../yum/__init__.py:578
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Scaricamento metadati del gruppo"
-#: ../yum/__init__.py:604
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Aggiunta file di gruppo dal repository: %s"
-#: ../yum/__init__.py:613
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Fallita l'aggiunta di file di gruppi per repository: %s - %s"
-#: ../yum/__init__.py:619
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Nessun gruppo disponibile in alcun repository"
-#: ../yum/__init__.py:669
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Import di informazioni addizionali sulla lista di file"
-#: ../yum/__init__.py:678
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
msgstr ""
-"Ci sono transazioni non completate. Considerare di lanciare prima "
-"yum-complete-transaction per portarle a termine."
+"Ci sono transazioni non completate. Considerare di lanciare prima yum-"
+"complete-transaction per portarle a termine."
-#: ../yum/__init__.py:744
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Ciclo skip-broken %i"
-#: ../yum/__init__.py:796
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Raggiunti %i cicli skip-broken"
-#: ../yum/__init__.py:797
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1679,90 +2011,79 @@ msgstr ""
"\n"
"Pacchetti saltati a causa di problemi di dipendenza:"
-#: ../yum/__init__.py:801
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s da %s"
-#: ../yum/__init__.py:945
-msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
-"Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti durante "
-"la transazione."
+"Attenzione: errori in scriptlet o altri errori non fatali sono avvenuti "
+"durante la transazione."
-#: ../yum/__init__.py:960
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Rimozione del file di transazione %s fallita"
-#: ../yum/__init__.py:1002
-#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr "escludendo per costo: %s da %s"
-
-#: ../yum/__init__.py:1033
-msgid "Excluding Packages in global exclude list"
-msgstr "Esclusione pacchetti nella lista globale di esclusione"
-
-#: ../yum/__init__.py:1035
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "Excluding Packages from %s"
-msgstr "Esclusione dei pacchetti da %s"
-
-#: ../yum/__init__.py:1064
-#, python-format
-msgid "Reducing %s to included packages only"
-msgstr "Riduzione %s ai soli pacchetti inclusi"
-
-#: ../yum/__init__.py:1070
-#, python-format
-msgid "Keeping included package %s"
-msgstr "Il pacchetto incluso %s verrà mantenuto"
+msgid "%s was supposed to be installed but is not!"
+msgstr ""
-#: ../yum/__init__.py:1076
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Removing unmatched package %s"
-msgstr "Rimozione pacchetto non corrispondente %s"
-
-#: ../yum/__init__.py:1079
-msgid "Finished"
-msgstr "Finito"
+msgid "%s was supposed to be removed but is not!"
+msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1109
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Non è possibile controllare se il PID %s è attivo"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1113
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Lock %s attivo: altro processo in esecuzione con pid %s."
-#: ../yum/__init__.py:1180
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, fuzzy, python-format
+msgid "Could not create lock at %s: %s "
+msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s"
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Il pacchetto non corrisponde al download desiderato"
-#: ../yum/__init__.py:1195
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Non è possibile calcolare il checksum"
-#: ../yum/__init__.py:1198
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Il pacchetto non corrisponde al checksum"
-#: ../yum/__init__.py:1241
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "il pacchetto ha fallito il checksum ma la cache è abilitata per %s"
-#: ../yum/__init__.py:1244 ../yum/__init__.py:1273
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "utilizzo di una copia locale di %s"
-#: ../yum/__init__.py:1285, python-format
+#: ../yum/__init__.py:1477
+#, python-format
msgid ""
"Insufficient space in download directory %s\n"
" * free %s\n"
@@ -1772,11 +2093,11 @@ msgstr ""
" * libero %s\n"
" * necessario %s"
-#: ../yum/__init__.py:1332
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "L'header non è completo."
-#: ../yum/__init__.py:1369
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1784,62 +2105,62 @@ msgstr ""
"Header non presente in cache locale e modalita solo-cache abilitata. "
"Impossibile scaricare %s"
-#: ../yum/__init__.py:1424
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "La chiave pubblica per %s non è installata"
-#: ../yum/__init__.py:1428
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problemi nell'apertura di %s"
-#: ../yum/__init__.py:1436
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "La chiave pubblica per %s non è sicura"
-#: ../yum/__init__.py:1440
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Il pacchetto %s non è firmato"
-#: ../yum/__init__.py:1478
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Non posso rimuovere %s"
-#: ../yum/__init__.py:1482
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s rimosso"
-#: ../yum/__init__.py:1518
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Impossibile rimuovere %s file %s"
-#: ../yum/__init__.py:1522
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s file %s rimosso"
-#: ../yum/__init__.py:1524
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s file rimossi"
-#: ../yum/__init__.py:1593
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Piu di una corrispondenza ugualein sack per %s"
-#: ../yum/__init__.py:1599
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Nessuna corrispondenza %s.%s %s:%s-%s dall'aggiornamento"
-#: ../yum/__init__.py:1817
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1847,168 +2168,186 @@ msgstr ""
"searchPackages() verrà eliminato in una futura versione di yum.In "
"sostituzione usare searchGenerator(). \n"
-#: ../yum/__init__.py:1855
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Ricerca dei pacchetti %d"
-#: ../yum/__init__.py:1859
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "Ricerca del pacchetto %s"
-#: ../yum/__init__.py:1871
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "ricerca nelle voci dei file"
-#: ../yum/__init__.py:1878
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "ricerca nelle voci fornite"
-#: ../yum/__init__.py:1911
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Corrispondenza tra i forniti: %s"
-#: ../yum/__init__.py:1960
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Nessun gruppo disponibile in alcun repository"
-#: ../yum/__init__.py:1991 ../yum/__init__.py:2010 ../yum/__init__.py:2041
-#: ../yum/__init__.py:2047 ../yum/__init__.py:2120 ../yum/__init__.py:2124
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Il gruppo %s non esiste"
-#: ../yum/__init__.py:2022 ../yum/__init__.py:2137
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "Il pacchetto %s non è marcato nel gruppo %s"
-#: ../yum/__init__.py:2069
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Aggiunta del pacchetto %s dal gruppo %s"
-#: ../yum/__init__.py:2073
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Nessun pacchetto di nome %s disponibile per l'installazione"
-#: ../yum/__init__.py:2162
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack"
-#: ../yum/__init__.py:2177
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "La tupla del pacchetto %s non può essere trovata nel pacchetto sack"
-#: ../yum/__init__.py:2229 ../yum/__init__.py:2270
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Flag di versione non valido"
-#: ../yum/__init__.py:2244 ../yum/__init__.py:2248
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Nessun pacchetto trovato per %s"
-#: ../yum/__init__.py:2425
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "L'oggetto pacchetto non era un'istanza dell'oggetto pacchetto"
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Non è specificato niente da installare"
-#: ../yum/__init__.py:2445
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Controllo per provide virtuale o file-provide per %s"
-#: ../yum/__init__.py:2451 ../yum/__init__.py:2704 ../yum/__init__.py:2874
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Nessuna corrispondenza per l'argomento: %s"
-#: ../yum/__init__.py:2522, python-format
+#: ../yum/__init__.py:2798
+#, python-format
msgid "Package %s installed and not available"
msgstr "Il pacchetto %s è installato e non disponibile."
-#: ../yum/__init__.py:2525
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Nessun pacchetto disponibile per l'installazione"
-#: ../yum/__init__.py:2537
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Pacchetto: %s - già nel set di transizione"
-#: ../yum/__init__.py:2552, python-format
+#: ../yum/__init__.py:2839
+#, fuzzy, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr ""
+"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo "
+"posto"
+
+#: ../yum/__init__.py:2842
+#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr ""
-"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo posto"
+"Il pacchetto %s è reso obsoleto da %s, tentativo di installare %s al suo "
+"posto"
-#: ../yum/__init__.py:2560
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Il pacchetto %s è già aggiornato all'ultima versione"
-#: ../yum/__init__.py:2567
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
-msgstr "Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti."
+msgstr ""
+"Corrispondenza del pacchetto %s già installato. Controllo aggiornamenti."
#. update everything (the easy case)
-#: ../yum/__init__.py:2648
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Aggiornamento Sistema"
-#: ../yum/__init__.py:2666 ../yum/__init__.py:2776 ../yum/__init__.py:2797
-#: ../yum/__init__.py:2823
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2701 ../yum/__init__.py:2871
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2767
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Il pacchetto è gia obsoleto: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2800 ../yum/__init__.py:2826, python-format
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "I pacchetti già resi obsoleti non verranno aggiornati: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr ""
"Aggiornamento non necessario per il pacchetto già aggiornato: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2887
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Nessun pacchetto corrispondente per la rimozione"
-#: ../yum/__init__.py:2921
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Non posso aprire il file %s. Lo salto."
-#: ../yum/__init__.py:2924
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Esame di %s: %s"
-#: ../yum/__init__.py:2932
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Impossibile aggiungere il pacchetto %s alla transazione. Architettura non "
"compatibile: %s"
-#: ../yum/__init__.py:2940
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2017,78 +2356,101 @@ msgstr ""
"Non è possibile aggiornare il pacchetto %s perchè non è installato. Eseguire "
"yum install per installarlo."
-#: ../yum/__init__.py:2973
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Esclusione di %s"
-#: ../yum/__init__.py:2978
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Marco %s per l'installazione"
-#: ../yum/__init__.py:2984
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "%s marcato come aggiornamento di %s"
-#: ../yum/__init__.py:2991
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: non aggiornare il pacchetto installato"
-#: ../yum/__init__.py:3009
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Problema nella reinstallazione: nessun pacchetto marcato per la rimozione"
-#: ../yum/__init__.py:3021, python-format
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
+#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Il pacchetto %s permette installazioni multiple, lo salto"
-#: ../yum/__init__.py:3030
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, fuzzy, python-format
+msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
"Problema nella reinstallazione: nessun pacchetto marcato per l'installazione"
-#: ../yum/__init__.py:3065
+#: ../yum/__init__.py:3515
+#, fuzzy
+msgid "No package(s) available to downgrade"
+msgstr "Nessun pacchetto disponibile per l'installazione"
+
+#: ../yum/__init__.py:3559
+#, fuzzy, python-format
+msgid "No Match for available package: %s"
+msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti"
+
+#: ../yum/__init__.py:3565
+#, fuzzy, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Controlla la disponibilità di aggiornamenti per i pacchetti"
+
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Dimensione totale del download: %s"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Recupero chiavi GPG da %s"
-#: ../yum/__init__.py:3085
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Recupero chiavi GPG fallito: "
-#: ../yum/__init__.py:3096, python-format
+#: ../yum/__init__.py:3735
+#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Analisi chiave GPG fallita: la chiave non ha valore %s"
-#: ../yum/__init__.py:3128
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "Chiave GPG in %s (0x%s) è già installata"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3133 ../yum/__init__.py:3195
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importazione chiave GPG 0x%s \"%s\" da %s"
-#: ../yum/__init__.py:3150
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Non installo le chiavi"
-#: ../yum/__init__.py:3156
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Importazione chiave fallita (codice %d)"
-#: ../yum/__init__.py:3157 ../yum/__init__.py:3216
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Chiave importata correttamente"
-#: ../yum/__init__.py:3162 ../yum/__init__.py:3221
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2100,91 +2462,97 @@ msgstr ""
"Controllare che le URL delle chiavi di questo repository siano configurate "
"correttamente."
-#: ../yum/__init__.py:3171
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Importazione della chiave(i) non utile, chiave(i) sbagliata?"
-#: ../yum/__init__.py:3190, python-format
+#: ../yum/__init__.py:3829
+#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "Chiave GPG in %s (0x%s) è già stata importata"
-#: ../yum/__init__.py:3210, python-format
+#: ../yum/__init__.py:3849
+#, python-format
msgid "Not installing key for repo %s"
msgstr "La chiave per il repo %s non verrà installata"
-#: ../yum/__init__.py:3215
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Importazione chiave fallita"
-#: ../yum/__init__.py:3306
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Impossibile trovare un mirror adatto."
-#: ../yum/__init__.py:3308
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Sono stati riscontrati degli errori durante il download dei pacchetti."
-#: ../yum/__init__.py:3349, python-format
+#: ../yum/__init__.py:4028
+#, python-format
msgid "Please report this error at %s"
msgstr "Riportare questo errore in %s"
-#: ../yum/__init__.py:3373
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Errori nel test di transazione: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:204
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr "Plugin caricati:"
-#: ../yum/plugins.py:218 ../yum/plugins.py:224, python-format
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
+#, python-format
msgid "No plugin match for: %s"
msgstr "Nessun plugin corrisponde per: %s"
-#: ../yum/plugins.py:254, python-format
+#: ../yum/plugins.py:252
+#, python-format
msgid "Not loading \"%s\" plugin, as it is disabled"
msgstr "Plugin \"%s\" non caricato, è disabilitato"
#. Give full backtrace:
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Il plugin \"%s\" non può essere importato"
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Il plugin \"%s\" non specifica la versione API richiesta"
-#: ../yum/plugins.py:278
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Il plugin \"%s\" richiede l'API %s. L'API supportata è %s"
-#: ../yum/plugins.py:311
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "Caricamento del plugin \"%s\""
-#: ../yum/plugins.py:318
+#: ../yum/plugins.py:316
#, python-format
-msgid "Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr ""
"Esistono due o più plugin con il nome \"%s\" nel percorso di ricerca plugin"
-#: ../yum/plugins.py:338
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr "File di configurazione %s non trovato"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:341
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Non posso trovare il file di configurazione per il plugin %s"
-#: ../yum/plugins.py:495
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "registrazione dei comandi non supportata"
@@ -2192,41 +2560,86 @@ msgstr "registrazione dei comandi non supportata"
msgid "Repackaging"
msgstr "Reimpacchetto"
-#: ../rpmUtils/oldUtils.py:26
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "L'header non può essere aperto o %s non corrisponde, %s."
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr "Controllo md5 dell'RPM %s fallito"
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr "Non posso aprire il database RPM per la lettura. Forse è gia in uso?"
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Header ritornato vuoto, qualcosa è andato storto"
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Header danneggiato %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Errore nell'apertura dell'rpm %s - errore %s"
+#~ msgid "Matching packages for package list to user args"
+#~ msgstr ""
+#~ "Ricerca corrispondenza degli argomenti dell'utente nella lista dei "
+#~ "pacchetti"
+
+#~ msgid ""
+#~ "\n"
+#~ "Transaction Summary\n"
+#~ "%s\n"
+#~ "Install %5.5s Package(s) \n"
+#~ "Update %5.5s Package(s) \n"
+#~ "Remove %5.5s Package(s) \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Riepilogo della transazione\n"
+#~ "%s\n"
+#~ "Installazione di %5.5s Pacchetto(i)\n"
+#~ "Aggiornamento di %5.5s Pacchetto(i)\n"
+#~ "Rimozione di %5.5s Pacchetto(i)\n"
+
+#~ msgid "excluding for cost: %s from %s"
+#~ msgstr "escludendo per costo: %s da %s"
+
+#~ msgid "Excluding Packages in global exclude list"
+#~ msgstr "Esclusione pacchetti nella lista globale di esclusione"
+
+#~ msgid "Excluding Packages from %s"
+#~ msgstr "Esclusione dei pacchetti da %s"
+
+#~ msgid "Reducing %s to included packages only"
+#~ msgstr "Riduzione %s ai soli pacchetti inclusi"
+
+#~ msgid "Keeping included package %s"
+#~ msgstr "Il pacchetto incluso %s verrà mantenuto"
+
+#~ msgid "Removing unmatched package %s"
+#~ msgstr "Rimozione pacchetto non corrispondente %s"
+
+#~ msgid "Finished"
+#~ msgstr "Finito"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() è deprecato, usare self.rpmdb.searchPkgTuple"
+#~ "().\n"
+
#~ msgid "Parsing package install arguments"
#~ msgstr "Analisi degli argomenti di installazione dei pacchetti"
-#~ msgid "Could not find update match for %s"
-#~ msgstr "Impossibile trovare una corrispondenza per l'aggiornamento di %s"
-
#~ msgid ""
#~ "Failure finding best provider of %s for %s, exceeded maximum loop length"
#~ msgstr ""
@@ -2274,8 +2687,5 @@ msgstr "Errore nell'apertura dell'rpm %s - errore %s"
#~ msgid "TSINFO: Updating %s to resolve conflict."
#~ msgstr "TSINFO: %s aggiornato per risolvere conflitti."
-#~ msgid "%s conflicts: %s"
-#~ msgstr "Conflitti di %s: %s"
-
#~ msgid "%s conflicts with %s"
#~ msgstr "%s è in conflitto con %s"
diff --git a/po/ja.po b/po/ja.po
index e7b7084..c44488d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum (yum-3_2_X)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-21 03:07+0900\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-09-21 04:52+0900\n"
"Last-Translator: Tadashi Jokagi <elf@elf.no-ip.org>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -16,113 +16,116 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: callback.py:48 output.py:938 yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "更新"
-#: callback.py:49 yum/rpmtrans.py:72
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr "削除中"
-#: callback.py:50 callback.py:51 callback.py:53 output.py:937
-#: yum/rpmtrans.py:73 yum/rpmtrans.py:74 yum/rpmtrans.py:76
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "インストールしています"
-#: callback.py:52 callback.py:58 yum/rpmtrans.py:75
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr "不要でした"
-#: callback.py:54 output.py:1061
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "更新しました"
-#: callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "削除しました"
-#: callback.py:56 callback.py:57 callback.py:59 output.py:1059
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "インストールしました"
-#: callback.py:130
+#: ../callback.py:130
msgid "No header - huh?"
msgstr "ヘッダーがありません - はて?"
-#: callback.py:168
+#: ../callback.py:168
msgid "Repackage"
msgstr "再パッケージ"
-#: callback.py:189
+#: ../callback.py:189
#, python-format
msgid "Error: invalid output state: %s for %s"
msgstr "エラー: 不正な出力状態: %s for %s"
-#: callback.py:212
+#: ../callback.py:212
#, python-format
msgid "Erased: %s"
msgstr "削除しました: %s"
-#: callback.py:217 output.py:939
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "削除"
-#: callback.py:219 yum/rpmtrans.py:77
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr "整理中"
-#: cli.py:107
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "コマンド「%s」はすでに定義済みです"
-#: cli.py:119
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "リポジトリーの設定"
-#: cli.py:130
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "ローカルファイルからリポジトリーのメタデータを読み込んでいます"
-#: cli.py:193 utils.py:102
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "設定エラー: %s"
-#: cli.py:196 cli.py:1253 utils.py:105
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "オプションエラー: %s"
-#: cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr ""
-#: cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr ""
-#: cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr ""
-#: cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "いくつかのコマンドを指定する必要があります"
-#: cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "ディスク要求:\n"
-#: cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " 少なくとも %d MB の空き容量がファイルシステム %s で必要です。\n"
-#: cli.py:318
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -130,246 +133,248 @@ msgstr ""
"エラーの要約\n"
"-------------\n"
-#: cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
"トランザクションの実行を試みましたが、何もありませんでした。終了します。"
-#: cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "ユーザーコマンドを終了しています"
-#: cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "パッケージをダウンロードしています:"
-#: cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "パッケージのダウンロードでエラー:\n"
-#: cli.py:420 yum/__init__.py:3873
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "rpm_check_debug を実行しています"
-#: cli.py:429 yum/__init__.py:3882
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr ""
-#: cli.py:431 yum/__init__.py:3885
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
-#: cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr ""
-#: cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "%s にこのエラーを報告してください"
-#: cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "トランザクションのテストを実行しています"
-#: cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "トランザクションのテストを終了しました"
-#: cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "トランザクションの確認エラー\n"
-#: cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "トランザクションのテストを成功しました"
-#: cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "トランザクションを実行しています"
-#: cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-#: cli.py:540 cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr ""
-#: cli.py:557 cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "パッケージ %s%s%s は利用できますが、インストールしませんでした。"
-#: cli.py:571 cli.py:602 cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "パッケージ %s%s%s は利用できません。"
-#: cli.py:607 cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "インストールするパッケージ"
-#: cli.py:608 cli.py:686 cli.py:719 cli.py:741 yumcommands.py:157
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "何もしません"
-#: cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d 個のパッケージが更新の設定しました"
-#: cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "更新と設定されたパッケージがありません"
-#: cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d 個のパッケージが削除の設定しました"
-#: cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "削除と設定されたパッケージがありません"
-#: cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "ダウングレードするパッケージ"
-#: cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr ""
-#: cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "インストール済みパッケージ %s%s%s%s は利用できません。"
-#: cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "再インストールするパッケージ"
-#: cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "パッケージが提供されていません"
-#: cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "警告: 一致するものが見つかりません: %s"
-#: cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "見つかりませんでした"
-#: cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
msgstr ""
-#: cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "%s のパッケージが見つかりません"
-#: cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "すべて掃除しています"
-#: cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "ヘッダーを掃除しています"
-#: cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "パッケージを掃除しています"
-#: cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "XML メタデータを掃除しています"
-#: cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "データベースキャッシュを掃除しています"
-#: cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "期限切れのメタデータキャッシュを掃除しています"
-#: cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "プラグインを掃除しています"
-#: cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "インストール済みグループ:"
-#: cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "利用可能なグループ"
-#: cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "完了"
-#: cli.py:972 cli.py:990 cli.py:996 yum/__init__.py:2579
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "警告: グループ %s が存在しません。"
-#: cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
-#: cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d 個のパッケージをインストールします"
-#: cli.py:1012 yum/__init__.py:2591
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "グループ名 %s が存在しません"
-#: cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "グループから削除するパッケージがありません"
-#: cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d 個のパッケージを削除します"
-#: cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "パッケージ %s は既にインストールされているので飛ばします"
-#: cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "非互換のパッケージ %s.%s を破棄しています"
-#: cli.py:1099
+#. we've not got any installed that match n or n+a
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
-#: cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr ""
-#: cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "コマンドラインエラー: %s"
-#: cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -380,258 +385,258 @@ msgstr ""
"\n"
"%s: オプション %sは引数が必要です "
-#: cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color がとることができる値な次のうちひとつです: auto、always、never"
-#: cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "このヘルプメッセージを表示して終了する"
-#: cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr ""
-#: cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "キャッシュから完全に実行します。キャッシュを更新しません"
-#: cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "構成ファイルの場所"
-#: cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "コマンドの最大待ち時間"
-#: cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "デバッグ情報の出力レベル"
-#: cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "一覧/検索コマンドのリポジトリーの重複の表示"
-#: cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "エラー出力レベル"
-#: cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "静かに処理をする"
-#: cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "冗長に処理をする"
-#: cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "すべての問い合わせに「yes」で答える"
-#: cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "Yum のバージョンを表示して終了する"
-#: cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "インストールのベースディレクトリを設定する"
-#: cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "ひとつ以上のリポジトリーを有効にする (ワイルドカード許可)"
-#: cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "ひとつ以上のリポジトリーを無効にする (ワイルドカード許可)"
-#: cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "名前かワイルドカードでパッケージを除外する"
-#: cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr ""
-#: cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "更新中に不要な処理を有効にします"
-#: cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "Yum プラグインを無効にする"
-#: cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "GPG 署名の確認を無効にする"
-#: cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "名前でプラグインを無効にする"
-#: cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "名前でプラグインを有効にする"
-#: cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "依存性に問題があるパッケージを飛ばす"
-#: cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr ""
-#: output.py:303
+#: ../output.py:305
msgid "Jan"
msgstr "1 月"
-#: output.py:303
+#: ../output.py:305
msgid "Feb"
msgstr "2 月"
-#: output.py:303
+#: ../output.py:305
msgid "Mar"
msgstr "3 月"
-#: output.py:303
+#: ../output.py:305
msgid "Apr"
msgstr "4 月"
-#: output.py:303
+#: ../output.py:305
msgid "May"
msgstr "5 月"
-#: output.py:303
+#: ../output.py:305
msgid "Jun"
msgstr "6 月"
-#: output.py:304
+#: ../output.py:306
msgid "Jul"
msgstr "7 月"
-#: output.py:304
+#: ../output.py:306
msgid "Aug"
msgstr "8 月"
-#: output.py:304
+#: ../output.py:306
msgid "Sep"
msgstr "9 月"
-#: output.py:304
+#: ../output.py:306
msgid "Oct"
msgstr "10 月"
-#: output.py:304
+#: ../output.py:306
msgid "Nov"
msgstr "11 月"
-#: output.py:304
+#: ../output.py:306
msgid "Dec"
msgstr "12 月"
-#: output.py:314
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "他のミラーを試します。"
-#: output.py:536
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "名前 : %s%s%s"
-#: output.py:537
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "アーキテクチャ: %s"
-#: output.py:539
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "エポック : %s"
-#: output.py:540
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "バージョン : %s"
-#: output.py:541
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "リリース : %s"
-#: output.py:542
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "容量 : %s"
-#: output.py:543
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "リポジトリー : %s"
-#: output.py:545
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr ""
-#: output.py:547
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "コミット者 : %s"
-#: output.py:548
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "コミット日時 : %s"
-#: output.py:549
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "ビルド日時 : %s"
-#: output.py:551
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "インストール日時 : %s "
-#: output.py:552
+#: ../output.py:554
msgid "Summary : "
msgstr "要約 : "
-#: output.py:554
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: output.py:555
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "ライセンス : %s"
-#: output.py:556
+#: ../output.py:558
msgid "Description: "
msgstr "説明 : "
-#: output.py:624
+#: ../output.py:626
msgid "y"
msgstr "y"
-#: output.py:624
+#: ../output.py:626
msgid "yes"
msgstr "はい"
-#: output.py:625
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: output.py:625
+#: ../output.py:627
msgid "no"
msgstr "いいえ"
# REMEMBER to Translate [Y/N] to the current locale
-#: output.py:629
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "これでいいですか? [y/N]"
-#: output.py:720
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -640,141 +645,141 @@ msgstr ""
"\n"
"グループ: %s"
-#: output.py:724
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " グループ ID: %s"
-#: output.py:729
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " 説明: %s"
-#: output.py:731
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " 強制的なパッケージ:"
-#: output.py:732
+#: ../output.py:734
msgid " Default Packages:"
msgstr " 標準パッケージ:"
-#: output.py:733
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " オプションパッケージ:"
-#: output.py:734
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " 条件付パッケージ:"
-#: output.py:754
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "パッケージ : %s"
-#: output.py:756
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " このパッケージの依存はありません"
-#: output.py:761
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " 依存性 : %s"
-#: output.py:763
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " 満たされていない依存性"
-#: output.py:835
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "リポジトリー : %s"
-#: output.py:836
+#: ../output.py:838
msgid "Matched from:"
msgstr ""
-#: output.py:845
+#: ../output.py:847
msgid "Description : "
msgstr "説明 : "
-#: output.py:848
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: output.py:851
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "ライセンス : %s"
-#: output.py:854
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "リリース : %s"
-#: output.py:858
+#: ../output.py:860
msgid "Other : "
msgstr "その他 : "
-#: output.py:891
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "総ダウンロード容量の計算中にエラーです"
-#: output.py:896
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "合計容量: %s"
-#: output.py:899
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "総ダウンロード容量: %s"
-#: output.py:940
+#: ../output.py:942
msgid "Reinstalling"
msgstr "再インストールをしています"
-#: output.py:941
+#: ../output.py:943
msgid "Downgrading"
msgstr "ダウングレードをしています"
-#: output.py:942
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "依存性関連でのインストールをしています"
-#: output.py:943
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "依存性関連での更新をしています"
-#: output.py:944
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "依存性関連での削除をします"
-#: output.py:951 output.py:1063
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "飛ばしました (依存性の問題)"
-#: output.py:974
+#: ../output.py:976
msgid "Package"
msgstr ""
-#: output.py:974
+#: ../output.py:976
msgid "Arch"
msgstr ""
-#: output.py:975
+#: ../output.py:977
msgid "Version"
msgstr ""
-#: output.py:975
+#: ../output.py:977
msgid "Repository"
msgstr ""
-#: output.py:976
+#: ../output.py:978
msgid "Size"
msgstr ""
-#: output.py:988
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -783,7 +788,7 @@ msgstr ""
" 置き換えています %s%s%s.%s %s\n"
"\n"
-#: output.py:997
+#: ../output.py:999
#, python-format
msgid ""
"\n"
@@ -791,14 +796,14 @@ msgid ""
"%s\n"
msgstr ""
-#: output.py:1004
+#: ../output.py:1006
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
"Upgrade %5.5s Package(s)\n"
msgstr ""
-#: output.py:1013
+#: ../output.py:1015
#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
@@ -806,35 +811,40 @@ msgid ""
"Downgrade %5.5s Package(s)\n"
msgstr ""
-#: output.py:1057
+#: ../output.py:1059
msgid "Removed"
msgstr "削除しました"
-#: output.py:1058
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "依存性の削除をしました"
-#: output.py:1060
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "依存性関連をインストールしました"
-#: output.py:1062
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "依存性を更新しました"
-#: output.py:1064
+#: ../output.py:1066
msgid "Replaced"
msgstr "置換しました"
-#: output.py:1065
+#: ../output.py:1067
msgid "Failed"
msgstr "失敗しました"
-#: output.py:1131
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1133
msgid "two"
msgstr ""
-#: output.py:1142
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
@@ -843,74 +853,219 @@ msgid ""
"to exit.\n"
msgstr ""
-#: output.py:1153
+#: ../output.py:1155
msgid "user interrupt"
msgstr "ユーザーの割り込み"
-#: output.py:1171
+#: ../output.py:1173
msgid "Total"
msgstr "合計"
-#: output.py:1186
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "トランザクションを実行しています"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "トランザクションの確認エラー\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, fuzzy, python-format
+msgid "(%s seconds)"
+msgstr "%s 秒 (最終: %s)"
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "その他 : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "不要でした"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "失敗しました"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "トランザクションの確認エラー\n"
+
+#: ../output.py:1405
+#, fuzzy
+msgid "Downgraded"
+msgstr "ダウングレードをしています"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "パッケージが提供されていません"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "エラー: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "インストール"
-#: output.py:1187
+#: ../output.py:1525
msgid "updated"
msgstr "更新"
-#: output.py:1188
+#: ../output.py:1526
msgid "obsoleted"
msgstr "不要"
-#: output.py:1189
+#: ../output.py:1527
msgid "erased"
msgstr "削除"
-#: output.py:1193
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> パッケージ %s.%s %s:%s-%s を%sに設定しました"
-#: output.py:1200
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> トランザクションの確認を実行しています"
-#: output.py:1205
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> 新しい変更と依存性の解決を再開しています。"
-#: output.py:1210
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> 依存性解決を終了しました"
-#: output.py:1215 output.py:1220
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> 依存性の処理をしています: %s のパッケージ: %s"
-#: output.py:1224
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> 未解決の依存性: %s"
-#: output.py:1230 output.py:1235
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> 衝突を処理しています: %s は %s と衝突しています"
-#: output.py:1239
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
-#: output.py:1243
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
"---> トランザクションセットに束ねるために %s のヘッダーをダウンロードしていま"
"す"
-#: utils.py:132 yummain.py:42
+#: ../utils.py:137 ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -920,7 +1075,7 @@ msgstr ""
"\n"
"ユーザーの取り消しで終了しています"
-#: utils.py:138 yummain.py:48
+#: ../utils.py:143 ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -930,23 +1085,26 @@ msgstr ""
"\n"
"パイプが壊れたため終了しています"
-#: utils.py:140 yummain.py:50
+#: ../utils.py:145 ../yummain.py:50
#, python-format
msgid ""
"\n"
"\n"
"%s"
-msgstr "\n\n%s"
+msgstr ""
+"\n"
+"\n"
+"%s"
-#: utils.py:179 yummain.py:273
+#: ../utils.py:184 ../yummain.py:273
msgid "Complete!"
msgstr "完了しました!"
-#: yumcommands.py:40
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "このコマンドを実行するには root である必要があります。"
-#: yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -964,332 +1122,335 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
-#: yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "エラー: パッケージの一覧を %s に渡す必要があります"
-#: yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "エラー: 一致する項目が必要です"
-#: yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "エラー: グループ化グループの一覧が必要です"
-#: yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "エラー: clean は引数をひとつ要求します: %s"
-#: yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "エラー: 不正な clean の引数です: %r"
-#: yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "シェルへの引数がありません"
-#: yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "シェルに渡すファイル名: %s"
-#: yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr "シェルへの引数として渡したファイル %s は存在しません。"
-#: yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr "エラー: シェルへの引数としてひとつ以上のファイルを渡しました。"
-#: yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "パッケージ..."
-#: yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "システムにパッケージをインストールする"
-#: yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "インストール処理の設定をしています"
-#: yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[パッケージ...]"
-#: yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "システムのパッケージを更新する"
-#: yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "更新処理の設定をしています"
-#: yumcommands.py:244
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "パッケージもしくはパッケージのグループについての詳細を表示する"
-#: yumcommands.py:293
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "インストール済みパッケージ"
-#: yumcommands.py:301
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "利用可能なパッケージ"
-#: yumcommands.py:305
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "外部パッケージ"
-#: yumcommands.py:309
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "更新したパッケージ"
-#: yumcommands.py:317 yumcommands.py:324 yumcommands.py:600
+#. This only happens in verbose mode
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "パッケージを不要にしています"
-#: yumcommands.py:326
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "最近追加したパッケージ"
-#: yumcommands.py:333
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "表示するパッケージはありません"
-#: yumcommands.py:347
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "パッケージグループの一覧を表示する"
-#: yumcommands.py:359
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "システムから削除するパッケージ"
-#: yumcommands.py:366
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "削除処理の設定をしています"
-#: yumcommands.py:380
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "グループ処理の設定をしています"
-#: yumcommands.py:386
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr ""
-#: yumcommands.py:399
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "利用できるパッケージグループの一覧"
-#: yumcommands.py:416
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "システムのグループのパッケージをインストールする"
-#: yumcommands.py:438
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "システムからグループのパッケージを削除する"
-#: yumcommands.py:465
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "パッケージグループについての詳細を表示する"
-#: yumcommands.py:489
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "メタデータキャッシュを生成する"
-#: yumcommands.py:495
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "すべて飲めたデータファイルのキャッシュを作成します。"
-#: yumcommands.py:496
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
-#: yumcommands.py:517
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "メタデータのキャッシュを作成しました"
-#: yumcommands.py:531
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "キャッシュデータを削除する"
-#: yumcommands.py:551
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr ""
-#: yumcommands.py:571
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "更新に利用できるパッケージを確認する"
-#: yumcommands.py:620
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "指定した文字列でパッケージの詳細を検索する"
-#: yumcommands.py:626
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "パッケージの検索中: "
-#: yumcommands.py:643
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr ""
-#: yumcommands.py:651
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "更新処理の設定をしています"
-#: yumcommands.py:665
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "ローカル RPM のインストール"
-#: yumcommands.py:673
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "ローカルパッケージ処理の設定をしています"
-#: yumcommands.py:692
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr ""
-#: yumcommands.py:695
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "依存性のパッケージ検索:"
-#: yumcommands.py:709
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "対話型の yum シェルを実行する"
-#: yumcommands.py:715
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Yum シェルの設定をしています"
-#: yumcommands.py:733
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "パッケージの依存性の一覧を表示する"
-#: yumcommands.py:739
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "依存性の検索中: "
-#: yumcommands.py:755
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "ソフトウェアリポジトリーの構成を表示する"
-#: yumcommands.py:803 yumcommands.py:804
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "有効"
-#: yumcommands.py:812 yumcommands.py:813
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "無効"
-#: yumcommands.py:827
+#: ../yumcommands.py:834
msgid "Repo-id : "
msgstr "リポジトリーID : "
-#: yumcommands.py:828
+#: ../yumcommands.py:835
msgid "Repo-name : "
msgstr "リポジトリー名 : "
-#: yumcommands.py:829
+#: ../yumcommands.py:836
msgid "Repo-status : "
msgstr "リポジトリーの状態: "
-#: yumcommands.py:831
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "リポジトリーのリビジョン: "
-#: yumcommands.py:835
+#: ../yumcommands.py:842
msgid "Repo-tags : "
msgstr "リポジトリータグ : "
-#: yumcommands.py:841
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr ""
-#: yumcommands.py:846
+#: ../yumcommands.py:853
msgid "Repo-updated : "
msgstr ""
-#: yumcommands.py:848
+#: ../yumcommands.py:855
msgid "Repo-pkgs : "
msgstr ""
-#: yumcommands.py:849
+#: ../yumcommands.py:856
msgid "Repo-size : "
msgstr "リポジトリー容量 : "
-#: yumcommands.py:856
+#: ../yumcommands.py:863
msgid "Repo-baseurl : "
msgstr "リポジトリー基点 URL: "
-#: yumcommands.py:864
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "リポジトリー メタリンク: "
-#: yumcommands.py:868
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr "更新しました : "
-#: yumcommands.py:871
+#: ../yumcommands.py:878
msgid "Repo-mirrors : "
msgstr "リポジトリー ミラー: "
-#: yumcommands.py:875 yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr "不明"
-#: yumcommands.py:881
+#: ../yumcommands.py:888
#, python-format
msgid "Never (last: %s)"
msgstr ""
-#: yumcommands.py:883
+#: ../yumcommands.py:890
#, python-format
msgid "Instant (last: %s)"
msgstr "インスタント (最終: %s)"
-#: yumcommands.py:886
+#: ../yumcommands.py:893
#, python-format
msgid "%s second(s) (last: %s)"
msgstr "%s 秒 (最終: %s)"
-#: yumcommands.py:888
+#: ../yumcommands.py:895
msgid "Repo-expire : "
msgstr "リポジトリー期限 : "
-#: yumcommands.py:891
+#: ../yumcommands.py:898
msgid "Repo-exclude : "
msgstr "リポジトリー除外 : "
-#: yumcommands.py:895
+#: ../yumcommands.py:902
msgid "Repo-include : "
msgstr "リポジトリー内包 : "
-#: yumcommands.py:905 yumcommands.py:931
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "リポジトリー ID"
-#: yumcommands.py:919 yumcommands.py:920 yumcommands.py:934
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "状態"
-#: yumcommands.py:932
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "リポジトリー名"
-#: yumcommands.py:958
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "役立つ使い方のメッセージを表示する"
-#: yumcommands.py:992
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "%s のヘルプは利用できません"
-#: yumcommands.py:997
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1299,7 +1460,7 @@ msgstr ""
"\n"
"別名: "
-#: yumcommands.py:999
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1309,104 +1470,138 @@ msgstr ""
"\n"
"別名: "
-#: yumcommands.py:1027
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "再インストール処理の設定をしています"
-#: yumcommands.py:1035
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "パッケージの再インストール"
-#: yumcommands.py:1053
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "ダウングレード処理の設定をしています"
-#: yumcommands.py:1060
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "パッケージのダウングレード"
-#: yumcommands.py:1074
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr ""
-#: yumcommands.py:1101
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " グループ ID: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "外部パッケージ"
+
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "インストール済み:"
-#: yumcommands.py:1110
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "インストール済み:"
+
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "利用可能:"
-#: yummain.py:128
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "利用可能:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
+
+#: ../yummain.py:128
msgid "Running"
msgstr "実行中"
-#: yummain.py:129
+#: ../yummain.py:129
msgid "Sleeping"
msgstr "スリープ中"
-#: yummain.py:130
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "割り込み不可"
-#: yummain.py:131
+#: ../yummain.py:131
msgid "Zombie"
msgstr "ゾンビ"
-#: yummain.py:132
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr ""
-#: yummain.py:137
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " 他のアプリケーション: PackageKit"
-#: yummain.py:139
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " 他のアプリケーション: %s"
-#: yummain.py:142
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " メモリー: %5s RSS (%5sB VSZ)"
-#: yummain.py:146
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " 開始 : %s - %s 秒経過"
-#: yummain.py:148
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " 状態 : %s、PID: %d"
-#: yummain.py:173
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"別のアプリケーションが現在 yum のロックを持っています。終了するまで待っていま"
"す..."
-#: yummain.py:201 yummain.py:240
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "エラー: %s"
-#: yummain.py:211 yummain.py:253
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "不明なエラー: 終了コード: %d:"
-#: yummain.py:218
+#. Depsolve stage
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "依存性の解決をしています"
-#: yummain.py:242
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
msgstr " 問題を回避するために --skip-broken を用いることができません"
-#: yummain.py:243
+#: ../yummain.py:243
msgid ""
" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
@@ -1416,7 +1611,7 @@ msgstr ""
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"
-#: yummain.py:259
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1424,7 +1619,7 @@ msgstr ""
"\n"
"依存性を解決しました"
-#: yummain.py:326
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1435,299 +1630,300 @@ msgstr ""
"\n"
"ユーザーによる取り消しで終了しています。"
-#: yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "構成クラスが終わる前にトランザクションセットを設定しています"
-#: yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "構成ファイルの tsflag が不正です: %s"
-#: yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "依存性の pkgSack を検索しています: %s"
-#: yum/depsolve.py:183
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr ""
-#: yum/depsolve.py:191
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "%s は %s の要求に一致しました"
-#: yum/depsolve.py:232
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "メンバー: %s"
-#: yum/depsolve.py:246 yum/depsolve.py:756
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s をインストールに変更しました"
-#: yum/depsolve.py:253
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "モード %s にパッケージ %s を追加しています"
-#: yum/depsolve.py:263
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "パッケージ %s の削除をしています"
-#: yum/depsolve.py:285
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s の要求: %s"
-#: yum/depsolve.py:343
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "必要な要求は既に調べましたが不正をしています"
-#: yum/depsolve.py:353
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "必要な要求はパッケージ名ではありません。調べています: %s"
-#: yum/depsolve.py:360
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr ""
-#: yum/depsolve.py:383
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "%s のモードは %s が提供しています: %s"
-#: yum/depsolve.py:387
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "%s の提供しているパッケージのモード: %s"
-#: yum/depsolve.py:391
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr ""
-#: yum/depsolve.py:404
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
-#: yum/depsolve.py:407
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr ""
-#: yum/depsolve.py:415
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "依存する更新パスを見つけられません: %s"
-#: yum/depsolve.py:425
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "要求された %s は %s で解決しませんでした"
-#: yum/depsolve.py:448
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr ""
-#: yum/depsolve.py:490
+#. is it already installed?
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
"%s を提供するパッケージはすでにインストールされています。削除しています。"
-#: yum/depsolve.py:506
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
-#: yum/depsolve.py:517
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
-#: yum/depsolve.py:525 yum/depsolve.py:571
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "依存性の欠落: %s はパッケージ %s が必要としています"
-#: yum/depsolve.py:538
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s はすでに ts にあります。これを飛ばします"
-#: yum/depsolve.py:581
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: %s を更新として %s で設定しています"
-#: yum/depsolve.py:589
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: %s をインストールとして %s で設定しています"
-#: yum/depsolve.py:692 yum/depsolve.py:774
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "成功 - 空のトランザクション"
-#: yum/depsolve.py:731 yum/depsolve.py:746
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "ループを再開しています"
-#: yum/depsolve.py:762
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "依存性の処理を終了しています"
-#: yum/depsolve.py:768
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s(%s) は依存性に問題があります"
-#: yum/depsolve.py:775
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "成功 - 依存性を解決しました"
-#: yum/depsolve.py:789
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "%s の依存性を確認しています"
-#: yum/depsolve.py:872
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "%s の要求として %s を検索しています"
-#: yum/depsolve.py:1014
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "%s の compare_providers() を実行しています"
-#: yum/depsolve.py:1048 yum/depsolve.py:1054
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr ""
-#: yum/depsolve.py:1149
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr ""
-#: yum/depsolve.py:1161
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
" Winner: %s"
msgstr ""
-#: yum/depsolve.py:1168
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "%s と %s の共通ソース RPM(SRPM)"
-#: yum/depsolve.py:1174
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "%s から %s と %s の共通接頭辞"
-#: yum/depsolve.py:1182
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "最適の順序: %s"
-#: yum/__init__.py:180
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/__init__.py:401
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "リポジトリー %r は構成中に名前がありませんので ID を使います"
-#: yum/__init__.py:439
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "プラグインは既に初期化されています"
-#: yum/__init__.py:446
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "dbRpmDBSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/__init__.py:457
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "ローカルの RPMDB を読み込んでいます"
-#: yum/__init__.py:478
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/__init__.py:498
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/__init__.py:528
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr ""
-#: yum/__init__.py:573
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr ""
-#: yum/__init__.py:574
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "したがって、このリポジトリーはリセットできません。\n"
-#: yum/__init__.py:579
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/__init__.py:591
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "オブジェクトの更新を構築しています"
-#: yum/__init__.py:626
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() は Yum の将来のバージョンでなくなります。\n"
-#: yum/__init__.py:651
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "グループメタデータを取得しています"
-#: yum/__init__.py:677
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "リポジトリーからグループファイルを追加しています: %s"
-#: yum/__init__.py:686
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "リポジトリーのグループファイルに追加できませんでした: %s - %s"
-#: yum/__init__.py:692
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "いずれかのリポジトリーに利用できるグループはありません"
-#: yum/__init__.py:742
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "追加ファイル一覧情報にインポートしています"
-#: yum/__init__.py:756
+#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr "プログラム %s%s%s を yum-utils パッケージ内で発見しました。"
-#: yum/__init__.py:764
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1735,17 +1931,17 @@ msgstr ""
"終了していない残作業があります。それらを終了するためにはじめに yum-complete-"
"transaction の実行を検討するかもしれません。"
-#: yum/__init__.py:832
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr ""
-#: yum/__init__.py:885
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr ""
-#: yum/__init__.py:886
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1753,73 +1949,80 @@ msgstr ""
"\n"
"パッケージは依存関係に問題があるため、飛ばします:"
-#: yum/__init__.py:890
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr ""
-#: yum/__init__.py:1043
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"警告: スクリプト、もしくはその他で処理の間に致命的ではないエラーが発生しまし"
"た。"
-#: yum/__init__.py:1058
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "トランザクションファイル %s の削除に失敗しました"
-#: yum/__init__.py:1087
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr ""
-#: yum/__init__.py:1126
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr ""
-#: yum/__init__.py:1241
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "PID %s がアクティブかどうかの確認に失敗しました"
-#: yum/__init__.py:1245
+#. Another copy seems to be running.
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "ロックファイル %s が存在します: PID %s として別に実行されています。"
-#: yum/__init__.py:1280
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
#, python-format
msgid "Could not create lock at %s: %s "
msgstr "%s でロックを作成できません: %s"
-#: yum/__init__.py:1325
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "パッケージは意図したダウンロードと一致しません"
-#: yum/__init__.py:1340
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "チェックサムの実行ができません"
-#: yum/__init__.py:1343
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "パッケージのチェックサムが一致しません"
-#: yum/__init__.py:1385
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"%s のためにキャッシュを有効にしていますが、パッケージのチェックサム演算に失敗"
"します。"
-#: yum/__init__.py:1388 yum/__init__.py:1417
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "%s のローカルコピーを使う"
-#: yum/__init__.py:1429
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1830,11 +2033,11 @@ msgstr ""
" * 空き容量 %s\n"
" * 必要容量 %s"
-#: yum/__init__.py:1478
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "ヘッダーが完了していません。"
-#: yum/__init__.py:1515
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1842,62 +2045,62 @@ msgstr ""
"ヘッダーはキャッシュのみのモードが有効で、ローカルにありません。%s のダウン"
"ロードができません"
-#: yum/__init__.py:1570
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "%s の公開鍵がインストールされていません"
-#: yum/__init__.py:1574
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "パッケージ %s を開いている最中に問題です"
-#: yum/__init__.py:1582
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "%s の公開鍵が信頼されません"
-#: yum/__init__.py:1586
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "パッケージ %s は署名されていません"
-#: yum/__init__.py:1624
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "%s を削除できません"
-#: yum/__init__.py:1628
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s を削除しました"
-#: yum/__init__.py:1664
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "%s のファイル %s を削除できませんでした"
-#: yum/__init__.py:1668
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s のファイル %s を削除しました"
-#: yum/__init__.py:1670
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %sファイルを削除しました"
-#: yum/__init__.py:1739
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: yum/__init__.py:1745
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "更新から %s.%s %s:%s-%s に一致しません"
-#: yum/__init__.py:1978
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1905,185 +2108,186 @@ msgstr ""
"searchPackages() は Yum の将来のバージョンでなくなりま"
"す。 代わりに searchGenerator() を使います。\n"
-#: yum/__init__.py:2020
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "%d 個のパッケージを検索しています"
-#: yum/__init__.py:2024
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "パッケージ %s を検索しています"
-#: yum/__init__.py:2036
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "ファイルのエントリーから検索しています"
-#: yum/__init__.py:2043
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "提供されたエントリーを検索しています"
-#: yum/__init__.py:2076
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr ""
-#: yum/__init__.py:2125
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "構成されたリポジトリーに利用できるグループはありません"
-#: yum/__init__.py:2156 yum/__init__.py:2175 yum/__init__.py:2206
-#: yum/__init__.py:2212 yum/__init__.py:2291 yum/__init__.py:2295
-#: yum/__init__.py:2605
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "グループ名 %s が存在しません"
-#: yum/__init__.py:2187 yum/__init__.py:2308
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "パッケージ%s はグループ %s で設定されていません"
-#: yum/__init__.py:2234
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "パッケージ %s をグループ %s から追加しています"
-#: yum/__init__.py:2238
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr ""
-#: yum/__init__.py:2335
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: yum/__init__.py:2349
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: yum/__init__.py:2405 yum/__init__.py:2455
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "不正なバージョンフラグ"
-#: yum/__init__.py:2425 yum/__init__.py:2430
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "%s のパッケージが見つかりません"
-#: yum/__init__.py:2646
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr ""
"パッケージ オブジェクトはパッケージ オブジェクト インスタンスではありません"
-#: yum/__init__.py:2650
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "インストールへの指定がありません"
-#: yum/__init__.py:2666 yum/__init__.py:3430
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: yum/__init__.py:2672 yum/__init__.py:2979 yum/__init__.py:3146
-#: yum/__init__.py:3436
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "引数に一致しません: %s"
-#: yum/__init__.py:2748
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "パッケージ %s はインストール済みか利用できません"
-#: yum/__init__.py:2751
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "インストールに利用できるパッケージはありません"
-#: yum/__init__.py:2763
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "パッケージ: %s - すでにトランザクション設定をしています"
-#: yum/__init__.py:2789
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "パッケージ %s は既にインストールされている %s で古くなっています"
-#: yum/__init__.py:2792
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr ""
"パッケージ %s は %s に不要です。代わりに %s のインストールを試みています"
-#: yum/__init__.py:2800
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "パッケージ %s はインストール済みか最新バージョンです"
-#: yum/__init__.py:2814
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"一致したパッケージ %s はすでにインストールされています。更新を確認していま"
"す。"
-#: yum/__init__.py:2908
+#. update everything (the easy case)
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "すべて更新しています"
-#: yum/__init__.py:2929 yum/__init__.py:3044 yum/__init__.py:3073
-#: yum/__init__.py:3100
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "既に不要なパッケージの更新はありません: %s.%s %s:%s-%s"
-#: yum/__init__.py:2964 yum/__init__.py:3143
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: yum/__init__.py:3035
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "パッケージは既に不要です: %s.%s %s:%s-%s"
-#: yum/__init__.py:3068
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "既に不要なパッケージの更新はありません: %s"
-#: yum/__init__.py:3077 yum/__init__.py:3104
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr ""
"既にアップデートされているのでパッケージをアップデートしません: %s.%s %s:%s-%"
"s"
-#: yum/__init__.py:3159
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "削除に一致するパッケージはありません"
-#: yum/__init__.py:3192 yum/__init__.py:3296 yum/__init__.py:3385
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "ファイル %s が開けません。飛ばします。"
-#: yum/__init__.py:3195 yum/__init__.py:3299 yum/__init__.py:3388
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "%s を調べています: %s"
-#: yum/__init__.py:3203 yum/__init__.py:3302 yum/__init__.py:3391
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"トランザクションにパッケージ %s を追加できません。アーキテクチャに互換性があ"
"りません: %s"
-#: yum/__init__.py:3211
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2092,92 +2296,99 @@ msgstr ""
"パッケージ %s はインストールされていないので更新できません。代わりに「yum "
"install」を実行してインストールしてください。"
-#: yum/__init__.py:3246 yum/__init__.py:3313 yum/__init__.py:3402
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "%s の除外中"
-#: yum/__init__.py:3251
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "%s をインストール済みとして設定しています"
-#: yum/__init__.py:3257
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "次のリポジトリーへの更新として %s を設定します: %s"
-#: yum/__init__.py:3264
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: インストールされたパッケージを更新しません。"
-#: yum/__init__.py:3332
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "再インストール中に問題: 削除するパッケージがありません"
-#: yum/__init__.py:3345 yum/__init__.py:3463
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "パッケージ %s は複数インストールが許可されています。飛ばします"
-#: yum/__init__.py:3366
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
-msgstr "再インストール中に問題: %s に一致したインストール用パッケージがありません"
+msgstr ""
+"再インストール中に問題: %s に一致したインストール用パッケージがありません"
-#: yum/__init__.py:3455
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "ダウングレードに利用できるパッケージはありません"
-#: yum/__init__.py:3499
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "利用可能なパッケージが一致しません: %s"
-#: yum/__init__.py:3505
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "アップグレードでのみ利用できるパッケージ: %s"
-#: yum/__init__.py:3564
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "ダウングレードするパッケージ"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "%s から GPG 鍵を取得しています"
-#: yum/__init__.py:3584
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "GPG 鍵の取得に失敗しました: "
-#: yum/__init__.py:3595
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "GPG 鍵の解析に失敗しました: 鍵は値 %s を持っていません"
-#: yum/__init__.py:3627
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG 鍵 %s (0x%s) はすでにインストールしています"
-#: yum/__init__.py:3632 yum/__init__.py:3694
+#. Try installing/updating GPG key
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "GPG 公開鍵 0x%s 「%s」を %s からインポートしています"
-#: yum/__init__.py:3649
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "インストールする鍵がありません"
-#: yum/__init__.py:3655
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "鍵のインポートに失敗しました (コード: %d)"
-#: yum/__init__.py:3656 yum/__init__.py:3715
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "鍵のインポートに成功しました"
-#: yum/__init__.py:3661 yum/__init__.py:3720
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2185,127 +2396,131 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: yum/__init__.py:3670
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: yum/__init__.py:3689
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG 鍵 %s (0x%s) はすでにインポートしています"
-#: yum/__init__.py:3709
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "リポジトリー %s の鍵がインストールされていません"
-#: yum/__init__.py:3714
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "鍵のインポートに失敗しました"
-#: yum/__init__.py:3835
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "適当なミラーを見つけることができませんでした。"
-#: yum/__init__.py:3837
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "パッケージのダウンロード中にエラーに遭遇しました。"
-#: yum/__init__.py:3887
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "%s にこのエラーを報告してください"
-#: yum/__init__.py:3911
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "テストトランザクションでエラー: "
-#: yum/plugins.py:202
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr "読み込んだプラグイン:"
-#: yum/plugins.py:216 yum/plugins.py:222
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr "プラグインが一致しません: %s"
-#: yum/plugins.py:252
+#: ../yum/plugins.py:252
#, python-format
msgid "Not loading \"%s\" plugin, as it is disabled"
msgstr "無効になっているため、プラグイン「%s」は読み込みません"
-#: yum/plugins.py:264
+#. Give full backtrace:
+#: ../yum/plugins.py:264
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "プラグイン「%s」はインポートできませんでした"
-#: yum/plugins.py:271
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "プラグイン「%s」は要求された API バージョンを明記していません"
-#: yum/plugins.py:276
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr ""
"プラグイン「%s」は API %s を要求しています。サポートした API は %s です。"
-#: yum/plugins.py:309
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "プラグイン「%s」を読み込んでいます"
-#: yum/plugins.py:316
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr ""
-#: yum/plugins.py:336
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr "構成ファイル %s が見つかりません"
-#: yum/plugins.py:339
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "プラグイン %s の構成ファイルの検索に失敗しました"
-#: yum/plugins.py:497
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "コマンドの登録をサポートしていません"
-#: yum/rpmtrans.py:78
+#: ../yum/rpmtrans.py:78
msgid "Repackaging"
msgstr "再パッケージをしています"
-#: rpmUtils/oldUtils.py:33
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "%s (%s) が一致しないかヘッダーが開けません"
-#: rpmUtils/oldUtils.py:53
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr "RPM %s は MD5 検査に失敗しました"
-#: rpmUtils/oldUtils.py:151
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr ""
"読み込みのために RPM データベースを開くことができません。おそらく既に使用して"
"いませんか?"
-#: rpmUtils/oldUtils.py:183
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "空のヘッダーを取得しました。何かがうまくいっていません"
-#: rpmUtils/oldUtils.py:253 rpmUtils/oldUtils.py:260 rpmUtils/oldUtils.py:263
-#: rpmUtils/oldUtils.py:266
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "ヘッダー %s は損傷があります"
-#: rpmUtils/oldUtils.py:281
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "RPM %s へのアクセスでエラー - %s エラー"
diff --git a/po/ms.po b/po/ms.po
index 1e7a3e8..c47155d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 11:29+0100\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2008-02-12 21:06+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -15,34 +15,36 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.1\n"
-#: ../callback.py:48 ../output.py:512
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
#, fuzzy
msgid "Updating"
msgstr "Alat Mengemas Kini Menu"
-#: ../callback.py:49
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr ""
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr ""
-#: ../callback.py:52 ../callback.py:58
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr ""
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
#, fuzzy
msgid "Updated"
msgstr "dikemaskini pada %(date)s"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
#, fuzzy
msgid "Erased"
msgstr "Nota Keluaran Fedora"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr ""
@@ -65,737 +67,1077 @@ msgstr ""
msgid "Erased: %s"
msgstr "Nota Keluaran Fedora"
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:941
#, fuzzy
msgid "Removing"
msgstr "RPM rosak %s, membuang."
-#: ../callback.py:219
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr ""
-#: ../cli.py:103
+#: ../cli.py:106
#, fuzzy, python-format
msgid "Command \"%s\" already defined"
msgstr "Gaya ditakrif pengguna"
-#: ../cli.py:115
+#: ../cli.py:118
#, fuzzy
msgid "Setting up repositories"
msgstr "&Tetapan Halaman"
-#: ../cli.py:126
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr ""
-#: ../cli.py:183 ../utils.py:72
+#: ../cli.py:192 ../utils.py:107
#, fuzzy, python-format
msgid "Config Error: %s"
msgstr "Ralat KMail"
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, fuzzy, python-format
msgid "Options Error: %s"
msgstr "Ralat KMail"
-#: ../cli.py:229
+#: ../cli.py:223
+#, python-format
+msgid " Installed: %s-%s at %s"
+msgstr ""
+
+#: ../cli.py:225
+#, python-format
+msgid " Built : %s at %s"
+msgstr ""
+
+#: ../cli.py:227
+#, fuzzy, python-format
+msgid " Committed: %s at %s"
+msgstr "&Nama:"
+
+#: ../cli.py:266
msgid "You need to give some command"
msgstr ""
-#: ../cli.py:271
+#: ../cli.py:309
#, fuzzy
msgid "Disk Requirements:\n"
msgstr "Gantung Ke Cakera"
-#: ../cli.py:273
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr ""
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:278
+#: ../cli.py:316
#, fuzzy
msgid ""
"Error Summary\n"
"-------------\n"
msgstr "Ralat KMail"
-#: ../cli.py:317
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
-#: ../cli.py:347
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr ""
-#: ../cli.py:351
+#: ../cli.py:399
#, fuzzy
msgid "Downloading Packages:"
msgstr "Stat Pakej"
-#: ../cli.py:356
+#: ../cli.py:404
#, fuzzy
msgid "Error Downloading Packages:\n"
msgstr "Ralat mengira nilai!"
-#: ../cli.py:370 ../yum/__init__.py:2746
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr ""
-#: ../cli.py:373 ../yum/__init__.py:2749
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
-#: ../cli.py:377 ../yum/__init__.py:2751
-msgid "Please report this error in bugzilla"
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
+#, python-format
+msgid "Please report this error in %s"
msgstr ""
-#: ../cli.py:383
+#: ../cli.py:442
#, fuzzy
msgid "Running Transaction Test"
msgstr "Test Dialog Tanya"
-#: ../cli.py:399
+#: ../cli.py:458
#, fuzzy
msgid "Finished Transaction Test"
msgstr "Test Dialog Tanya"
-#: ../cli.py:401
+#: ../cli.py:460
#, fuzzy
msgid "Transaction Check Error:\n"
msgstr "Ralat mengira nilai!"
-#: ../cli.py:408
+#: ../cli.py:467
#, fuzzy
msgid "Transaction Test Succeeded"
msgstr "Test Dialog Tanya"
-#: ../cli.py:429
+#: ../cli.py:489
#, fuzzy
msgid "Running Transaction"
msgstr "Test Dialog Tanya"
-#: ../cli.py:459
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-#: ../cli.py:491
-msgid "Parsing package install arguments"
+#: ../cli.py:538 ../cli.py:572
+msgid " * Maybe you meant: "
msgstr ""
-#: ../cli.py:501
+#: ../cli.py:555 ../cli.py:563
+#, fuzzy, python-format
+msgid "Package(s) %s%s%s available, but not installed."
+msgstr "Akan Memasang"
+
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, fuzzy, python-format
-msgid "No package %s available."
+msgid "No package %s%s%s available."
msgstr "Fail Pakej RPM"
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#: ../cli.py:605 ../cli.py:738
#, fuzzy
msgid "Package(s) to install"
msgstr "Akan Memasang"
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
#, fuzzy
msgid "Nothing to do"
msgstr "-> Hendak buat apa ?"
-#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
-#: ../yum/__init__.py:2340
-#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr ""
-
-#: ../cli.py:568
-#, python-format
-msgid "Could not find update match for %s"
-msgstr ""
-
-#: ../cli.py:580
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr ""
-#: ../cli.py:583
+#: ../cli.py:642
#, fuzzy
msgid "No Packages marked for Update"
msgstr "Tiada skrip dijumpai"
-#: ../cli.py:599
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr ""
-#: ../cli.py:602
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr ""
-#: ../cli.py:614
+#: ../cli.py:683
#, fuzzy
-msgid "No Packages Provided"
-msgstr "(tiada cadangan ejaan)"
+msgid "Package(s) to downgrade"
+msgstr "Akan Memasang"
-#: ../cli.py:654
-msgid "Matching packages for package list to user args"
+#: ../cli.py:707
+#, python-format
+msgid " (from %s)"
msgstr ""
-#: ../cli.py:701
+#: ../cli.py:709
+#, fuzzy, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Fail Pakej RPM"
+
+#: ../cli.py:716
+#, fuzzy
+msgid "Package(s) to reinstall"
+msgstr "Akan Memasang"
+
+#: ../cli.py:729
+#, fuzzy
+msgid "No Packages Provided"
+msgstr "(tiada cadangan ejaan)"
+
+#: ../cli.py:813
#, fuzzy, python-format
msgid "Warning: No matches found for: %s"
msgstr "Tiada Pakej dijumpai untuk %s"
-#: ../cli.py:704
+#: ../cli.py:816
#, fuzzy
msgid "No Matches found"
msgstr "Tiada padanan dijumpai. :-("
-#: ../cli.py:745
+#: ../cli.py:855
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+
+#: ../cli.py:871
#, fuzzy, python-format
msgid "No Package Found for %s"
msgstr "Tiada Pakej %s"
-#: ../cli.py:757
+#: ../cli.py:883
#, fuzzy
msgid "Cleaning up Everything"
msgstr "&Tetapan Halaman"
-#: ../cli.py:771
+#: ../cli.py:897
#, fuzzy
msgid "Cleaning up Headers"
msgstr "Pengepala pembangunan VDR"
-#: ../cli.py:774
+#: ../cli.py:900
#, fuzzy
msgid "Cleaning up Packages"
msgstr "&Tetapan Halaman"
-#: ../cli.py:777
+#: ../cli.py:903
#, fuzzy
msgid "Cleaning up xml metadata"
msgstr "Pengepala pembangunan VDR"
-#: ../cli.py:780
+#: ../cli.py:906
#, fuzzy
msgid "Cleaning up database cache"
msgstr "Membersihkan pakej"
-#: ../cli.py:783
+#: ../cli.py:909
#, fuzzy
msgid "Cleaning up expire-cache metadata"
msgstr "Pengepala pembangunan VDR"
-#: ../cli.py:786
+#: ../cli.py:912
#, fuzzy
msgid "Cleaning up plugins"
msgstr "Nyahaktif semua plugin"
-#: ../cli.py:807
+#: ../cli.py:937
#, fuzzy
msgid "Installed Groups:"
msgstr "Pengguna dan Kumpulan"
-#: ../cli.py:814
+#: ../cli.py:949
#, fuzzy
msgid "Available Groups:"
msgstr "Form&at yang ada:"
-#: ../cli.py:820
+#: ../cli.py:959
#, fuzzy
msgid "Done"
msgstr "Selesai."
-#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, fuzzy, python-format
msgid "Warning: Group %s does not exist."
msgstr "Amaran: tandabuku yang anda berikan [%s] tidak wujud."
-#: ../cli.py:853
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
-#: ../cli.py:855
+#: ../cli.py:1000
#, fuzzy, python-format
msgid "%d Package(s) to Install"
msgstr "Akan Memasang"
-#: ../cli.py:865
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr ""
-#: ../cli.py:871
+#: ../cli.py:1016
#, fuzzy
msgid "No packages to remove from groups"
msgstr "Tiada skrip dijumpai"
-#: ../cli.py:873
+#: ../cli.py:1018
#, fuzzy, python-format
msgid "%d Package(s) to remove"
msgstr "Buang perubahan yang dicadangkan"
-#: ../cli.py:915
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr ""
-#: ../cli.py:926
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr ""
#. we've not got any installed that match n or n+a
-#: ../cli.py:952
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
-#: ../cli.py:971
+#: ../cli.py:1117
+msgid "Plugin Options"
+msgstr ""
+
+#: ../cli.py:1125
#, fuzzy, python-format
msgid "Command line error: %s"
msgstr "Ralat mengira nilai!"
-#: ../cli.py:1101
+#: ../cli.py:1138
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+
+#: ../cli.py:1191
+msgid "--color takes one of: auto, always, never"
+msgstr ""
+
+#: ../cli.py:1298
+msgid "show this help message and exit"
+msgstr ""
+
+#: ../cli.py:1302
#, fuzzy
msgid "be tolerant of errors"
msgstr "Ralat - %s tidak dijumpai"
-#: ../cli.py:1103
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr ""
-#: ../cli.py:1105
+#: ../cli.py:1306
#, fuzzy
msgid "config file location"
msgstr "Fail Config Ruang Kerja"
-#: ../cli.py:1107
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr ""
-#: ../cli.py:1109
+#: ../cli.py:1310
#, fuzzy
msgid "debugging output level"
msgstr "Gulung dibawah tahap 1"
-#: ../cli.py:1113
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
-#: ../cli.py:1115
+#: ../cli.py:1316
#, fuzzy
msgid "error output level"
msgstr "Gulung dibawah tahap 1"
-#: ../cli.py:1118
+#: ../cli.py:1319
msgid "quiet operation"
msgstr ""
-#: ../cli.py:1122
+#: ../cli.py:1321
+msgid "verbose operation"
+msgstr ""
+
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr ""
-#: ../cli.py:1124
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr ""
-#: ../cli.py:1125
+#: ../cli.py:1326
#, fuzzy
msgid "set install root"
msgstr "Pasang plugin baru"
-#: ../cli.py:1129
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1133
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1136
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr ""
-#: ../cli.py:1138
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr ""
-#: ../cli.py:1141
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr ""
-#: ../cli.py:1143
+#: ../cli.py:1344
#, fuzzy
msgid "disable Yum plugins"
msgstr "Nyahaktif semua plugin"
-#: ../cli.py:1145
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr ""
-#: ../cli.py:1147
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr ""
-#: ../cli.py:1150
+#: ../cli.py:1351
+msgid "enable plugins by name"
+msgstr ""
+
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr ""
-#: ../output.py:229
+#: ../cli.py:1356
+msgid "control whether color is used"
+msgstr ""
+
+#: ../output.py:305
msgid "Jan"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Feb"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Mar"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Apr"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "May"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Jun"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Jul"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Aug"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Sep"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Oct"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Nov"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Dec"
msgstr ""
-#: ../output.py:240
+#: ../output.py:316
msgid "Trying other mirror."
msgstr ""
-#: ../output.py:293
+#: ../output.py:538
#, fuzzy, python-format
-msgid "Name : %s"
+msgid "Name : %s%s%s"
msgstr "&Nama:"
-#: ../output.py:294
+#: ../output.py:539
#, fuzzy, python-format
msgid "Arch : %s"
msgstr "Saat semenjak permulaan zaman"
-#: ../output.py:296
+#: ../output.py:541
#, fuzzy, python-format
msgid "Epoch : %s"
msgstr "Saat semenjak permulaan zaman"
-#: ../output.py:297
+#: ../output.py:542
#, fuzzy, python-format
msgid "Version : %s"
msgstr "Versi"
-#: ../output.py:298
+#: ../output.py:543
#, fuzzy, python-format
msgid "Release : %s"
msgstr "Nota Keluaran Fedora"
-#: ../output.py:299
+#: ../output.py:544
#, fuzzy, python-format
msgid "Size : %s"
msgstr "Saiz:"
-#: ../output.py:300
+#: ../output.py:545
#, fuzzy, python-format
msgid "Repo : %s"
msgstr "&Nama:"
-#: ../output.py:302
+#: ../output.py:547
+#, fuzzy, python-format
+msgid "From repo : %s"
+msgstr "Versi"
+
+#: ../output.py:549
#, fuzzy, python-format
msgid "Committer : %s"
msgstr "&Nama:"
-#: ../output.py:303
+#: ../output.py:550
+#, fuzzy, python-format
+msgid "Committime : %s"
+msgstr "&Nama:"
+
+#: ../output.py:551
+#, fuzzy, python-format
+msgid "Buildtime : %s"
+msgstr "&Nama:"
+
+#: ../output.py:553
+#, fuzzy, python-format
+msgid "Installtime: %s"
+msgstr "Pengguna dan Kumpulan"
+
+#: ../output.py:554
#, fuzzy
msgid "Summary : "
msgstr "Ringkasan"
-#: ../output.py:305
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr ""
-#: ../output.py:306
+#: ../output.py:557
#, fuzzy, python-format
msgid "License : %s"
msgstr "Saiz:"
-#: ../output.py:307
+#: ../output.py:558
#, fuzzy
msgid "Description: "
msgstr "Huraian"
-#: ../output.py:351
-msgid "Is this ok [y/N]: "
-msgstr "Adakah ini ok [y/T]:"
-
-#: ../output.py:357 ../output.py:360
+#: ../output.py:626
msgid "y"
msgstr ""
-#: ../output.py:357
-msgid "n"
-msgstr "t"
-
-#: ../output.py:357 ../output.py:360
+#: ../output.py:626
msgid "yes"
msgstr "ya"
-#: ../output.py:357
+#: ../output.py:627
+msgid "n"
+msgstr "t"
+
+#: ../output.py:627
msgid "no"
msgstr "tidak"
-#: ../output.py:367
+#: ../output.py:631
+msgid "Is this ok [y/N]: "
+msgstr "Adakah ini ok [y/T]:"
+
+#: ../output.py:722
#, fuzzy, python-format
msgid ""
"\n"
"Group: %s"
msgstr "Kumpulan: %s"
-#: ../output.py:369
+#: ../output.py:726
+#, fuzzy, python-format
+msgid " Group-Id: %s"
+msgstr "Kumpulan: %s"
+
+#: ../output.py:731
#, fuzzy, python-format
msgid " Description: %s"
msgstr "Huraian"
-#: ../output.py:371
+#: ../output.py:733
#, fuzzy
msgid " Mandatory Packages:"
msgstr "Stat Pakej"
-#: ../output.py:376
+#: ../output.py:734
#, fuzzy
msgid " Default Packages:"
msgstr "Stat Pakej"
-#: ../output.py:381
+#: ../output.py:735
#, fuzzy
msgid " Optional Packages:"
msgstr "Stat Pakej"
-#: ../output.py:386
+#: ../output.py:736
#, fuzzy
msgid " Conditional Packages:"
msgstr "Stat Pakej"
-#: ../output.py:394
+#: ../output.py:756
#, fuzzy, python-format
msgid "package: %s"
msgstr "Pelihat Pakej"
-#: ../output.py:396
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr ""
-#: ../output.py:401
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr ""
-#: ../output.py:403
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr ""
-#: ../output.py:461
+#: ../output.py:837
+#, fuzzy, python-format
+msgid "Repo : %s"
+msgstr "&Nama:"
+
+#: ../output.py:838
#, fuzzy
msgid "Matched from:"
msgstr "Tiada padanan dijumpai. :-("
-#: ../output.py:487
+#: ../output.py:847
+#, fuzzy
+msgid "Description : "
+msgstr "Huraian"
+
+#: ../output.py:850
+#, fuzzy, python-format
+msgid "URL : %s"
+msgstr "&Nama:"
+
+#: ../output.py:853
+#, fuzzy, python-format
+msgid "License : %s"
+msgstr "Saiz:"
+
+#: ../output.py:856
+#, fuzzy, python-format
+msgid "Filename : %s"
+msgstr "Nota Keluaran Fedora"
+
+#: ../output.py:860
+#, fuzzy
+msgid "Other : "
+msgstr "&Nama:"
+
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr ""
-#: ../output.py:492
+#: ../output.py:898
#, fuzzy, python-format
msgid "Total size: %s"
msgstr "Jumlah saiz: "
-#: ../output.py:495
+#: ../output.py:901
#, fuzzy, python-format
msgid "Total download size: %s"
msgstr "Saiz lajur automatik"
-#: ../output.py:507
+#: ../output.py:942
#, fuzzy
-msgid "Package"
-msgstr "Pelihat Pakej"
-
-#: ../output.py:507
-msgid "Arch"
-msgstr ""
-
-#: ../output.py:507
-msgid "Version"
-msgstr "Versi"
+msgid "Reinstalling"
+msgstr "[pasang: %s]"
-#: ../output.py:507
-msgid "Repository"
+#: ../output.py:943
+msgid "Downgrading"
msgstr ""
-#: ../output.py:507
-msgid "Size"
-msgstr "Saiz"
-
-#: ../output.py:514
+#: ../output.py:944
#, fuzzy
msgid "Installing for dependencies"
msgstr "&Cari Bantuan"
-#: ../output.py:515
+#: ../output.py:945
#, fuzzy
msgid "Updating for dependencies"
msgstr "&Cari Bantuan"
-#: ../output.py:516
+#: ../output.py:946
#, fuzzy
msgid "Removing for dependencies"
msgstr "&Cari Bantuan"
-#: ../output.py:528
+#: ../output.py:953 ../output.py:1065
+msgid "Skipped (dependency problems)"
+msgstr ""
+
+#: ../output.py:976
+#, fuzzy
+msgid "Package"
+msgstr "Pelihat Pakej"
+
+#: ../output.py:976
+msgid "Arch"
+msgstr ""
+
+#: ../output.py:977
+msgid "Version"
+msgstr "Versi"
+
+#: ../output.py:977
+msgid "Repository"
+msgstr ""
+
+#: ../output.py:978
+msgid "Size"
+msgstr "Saiz"
+
+#: ../output.py:990
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-#: ../output.py:536
+#: ../output.py:999
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
-"=============================================================================\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
+"%s\n"
msgstr ""
-#: ../output.py:554
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr ""
-#: ../output.py:555
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr ""
-#: ../output.py:557
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr ""
-#: ../output.py:559
+#: ../output.py:1064
#, fuzzy
msgid "Dependency Updated"
msgstr "dikemaskini pada %(date)s"
-#: ../output.py:560
+#: ../output.py:1066
msgid "Replaced"
msgstr ""
-#: ../output.py:618
+#: ../output.py:1067
+#, fuzzy
+msgid "Failed"
+msgstr "[pasang: %s]"
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1133
+msgid "two"
+msgstr ""
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
-#: ../output.py:628
+#: ../output.py:1155
#, fuzzy
msgid "user interrupt"
msgstr "Maklumat Sampukan"
-#: ../output.py:639
+#: ../output.py:1173
+msgid "Total"
+msgstr ""
+
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Test Dialog Tanya"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Ralat mengira nilai!"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "&Nama:"
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+msgid "User :"
+msgstr ""
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+msgid "Aborted"
+msgstr ""
+
+#: ../output.py:1389
+msgid "Failure:"
+msgstr ""
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Ralat mengira nilai!"
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "(tiada cadangan ejaan)"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Ralat KMail"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
#, fuzzy
msgid "installed"
msgstr "[pasang: %s]"
-#: ../output.py:640
+#: ../output.py:1525
#, fuzzy
msgid "updated"
msgstr "dikemaskini pada %(date)s"
-#: ../output.py:641
+#: ../output.py:1526
msgid "obsoleted"
msgstr ""
-#: ../output.py:642
+#: ../output.py:1527
msgid "erased"
msgstr ""
-#: ../output.py:646
+#: ../output.py:1531
#, fuzzy, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "Tetap imej ini untuk dikedudukan"
-#: ../output.py:653
+#: ../output.py:1538
#, fuzzy
msgid "--> Running transaction check"
msgstr "Periksa untuk &Kemaskini"
-#: ../output.py:658
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr ""
-#: ../output.py:663
+#: ../output.py:1548
#, fuzzy
msgid "--> Finished Dependency Resolution"
msgstr "Tukar resolusi skrin"
-#: ../output.py:668
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr ""
-#: ../output.py:673
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr ""
-#: ../output.py:679
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr ""
-#: ../output.py:682
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
-#: ../output.py:686
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
-#: ../yumcommands.py:36
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr ""
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr ""
-#: ../yumcommands.py:43
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -813,339 +1155,526 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
-#: ../yumcommands.py:63
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr ""
-#: ../yumcommands.py:69
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr ""
-#: ../yumcommands.py:75
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr ""
-#: ../yumcommands.py:84
+#: ../yumcommands.py:90
#, fuzzy, python-format
msgid "Error: clean requires an option: %s"
msgstr "Mencipta akaun Wiki"
-#: ../yumcommands.py:89
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr ""
-#: ../yumcommands.py:102
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr ""
-#: ../yumcommands.py:105
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr ""
-#: ../yumcommands.py:109
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
-#: ../yumcommands.py:115
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
-#: ../yumcommands.py:156
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr ""
-#: ../yumcommands.py:159
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:168
+#: ../yumcommands.py:180
#, fuzzy
msgid "Setting up Install Process"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:179
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr ""
-#: ../yumcommands.py:182
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:190
+#: ../yumcommands.py:201
#, fuzzy
msgid "Setting up Update Process"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:204
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr ""
-#: ../yumcommands.py:212
+#: ../yumcommands.py:295
#, fuzzy
msgid "Installed Packages"
msgstr "Stat Pakej"
-#: ../yumcommands.py:213
+#: ../yumcommands.py:303
#, fuzzy
msgid "Available Packages"
msgstr "Stat Pakej"
-#: ../yumcommands.py:214
+#: ../yumcommands.py:307
#, fuzzy
msgid "Extra Packages"
msgstr "Stat Pakej"
-#: ../yumcommands.py:215
+#: ../yumcommands.py:311
#, fuzzy
msgid "Updated Packages"
msgstr "Stat Pakej"
-#: ../yumcommands.py:221 ../yumcommands.py:225
+#. This only happens in verbose mode
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
#, fuzzy
msgid "Obsoleting Packages"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:226
+#: ../yumcommands.py:328
#, fuzzy
msgid "Recently Added Packages"
msgstr "Fail Pakej RPM"
-#: ../yumcommands.py:232
+#: ../yumcommands.py:335
#, fuzzy
msgid "No matching Packages to list"
msgstr "Selit MathML dari fail"
-#: ../yumcommands.py:246
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr ""
-#: ../yumcommands.py:258
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr ""
-#: ../yumcommands.py:266
+#: ../yumcommands.py:368
#, fuzzy
msgid "Setting up Remove Process"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:278
+#: ../yumcommands.py:382
#, fuzzy
msgid "Setting up Group Process"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:284
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr ""
-#: ../yumcommands.py:297
+#: ../yumcommands.py:401
#, fuzzy
msgid "List available package groups"
msgstr "Form&at yang ada:"
-#: ../yumcommands.py:314
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr ""
-#: ../yumcommands.py:336
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr ""
-#: ../yumcommands.py:360
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr ""
-#: ../yumcommands.py:384
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr ""
-#: ../yumcommands.py:390
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr ""
-#: ../yumcommands.py:391
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
-#: ../yumcommands.py:412
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr ""
-#: ../yumcommands.py:426
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr ""
-#: ../yumcommands.py:447
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr ""
-#: ../yumcommands.py:467
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr ""
-#: ../yumcommands.py:490
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr ""
-#: ../yumcommands.py:496
+#: ../yumcommands.py:629
#, fuzzy
msgid "Searching Packages: "
msgstr "Mencari %d pakej"
-#: ../yumcommands.py:513
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr ""
-#: ../yumcommands.py:522
+#: ../yumcommands.py:654
#, fuzzy
msgid "Setting up Upgrade Process"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:536
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr ""
-#: ../yumcommands.py:545
+#: ../yumcommands.py:676
#, fuzzy
msgid "Setting up Local Package Process"
msgstr "Membersihkan pakej"
-#: ../yumcommands.py:564
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr ""
-#: ../yumcommands.py:567
+#: ../yumcommands.py:698
#, fuzzy
msgid "Searching Packages for Dependency:"
msgstr "Mencari %d pakej"
-#: ../yumcommands.py:581
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr ""
-#: ../yumcommands.py:587
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr ""
-#: ../yumcommands.py:605
+#: ../yumcommands.py:736
#, fuzzy
msgid "List a package's dependencies"
msgstr "&Cari Bantuan"
-#: ../yumcommands.py:611
+#: ../yumcommands.py:742
#, fuzzy
msgid "Finding dependencies: "
msgstr "&Cari Bantuan"
-#: ../yumcommands.py:627
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo id"
+#: ../yumcommands.py:810 ../yumcommands.py:811
+#, fuzzy
+msgid "enabled"
+msgstr "[pasang: %s]"
+
+#: ../yumcommands.py:819 ../yumcommands.py:820
+#, fuzzy
+msgid "disabled"
+msgstr "[pasang: %s]"
+
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
+msgstr "&Nama:"
+
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
+msgstr "Nota Keluaran Fedora"
+
+#: ../yumcommands.py:836
+msgid "Repo-status : "
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo name"
+#: ../yumcommands.py:838
+msgid "Repo-revision: "
msgstr ""
-#: ../yumcommands.py:645
-msgid "status"
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
+msgstr "Nota Keluaran Fedora"
+
+#: ../yumcommands.py:848
+msgid "Repo-distro-tags: "
msgstr ""
-#: ../yumcommands.py:651
+#: ../yumcommands.py:853
#, fuzzy
-msgid "enabled"
-msgstr "[pasang: %s]"
+msgid "Repo-updated : "
+msgstr "dikemaskini pada %(date)s"
-#: ../yumcommands.py:654
+#: ../yumcommands.py:855
#, fuzzy
-msgid "disabled"
-msgstr "[pasang: %s]"
+msgid "Repo-pkgs : "
+msgstr "&Nama:"
+
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
+msgstr "Nota Keluaran Fedora"
+
+#: ../yumcommands.py:863
+msgid "Repo-baseurl : "
+msgstr ""
+
+#: ../yumcommands.py:871
+msgid "Repo-metalink: "
+msgstr ""
+
+#: ../yumcommands.py:875
+#, fuzzy
+msgid " Updated : "
+msgstr "dikemaskini pada %(date)s"
+
+#: ../yumcommands.py:878
+msgid "Repo-mirrors : "
+msgstr ""
+
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr ""
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, python-format
+msgid "Instant (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:895
+msgid "Repo-expire : "
+msgstr ""
+
+#: ../yumcommands.py:898
+msgid "Repo-exclude : "
+msgstr ""
-#: ../yumcommands.py:671
+#: ../yumcommands.py:902
+msgid "Repo-include : "
+msgstr ""
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:912 ../yumcommands.py:938
+msgid "repo id"
+msgstr ""
+
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
+msgid "status"
+msgstr ""
+
+#: ../yumcommands.py:939
+msgid "repo name"
+msgstr ""
+
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr ""
-#: ../yumcommands.py:705
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr ""
-#: ../yumcommands.py:710
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
"aliases: "
msgstr ""
-#: ../yumcommands.py:712
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
"alias: "
msgstr ""
-#: ../yumcommands.py:741
+#: ../yumcommands.py:1034
#, fuzzy
msgid "Setting up Reinstall Process"
msgstr "&Tetapan Halaman"
-#: ../yumcommands.py:755
+#: ../yumcommands.py:1042
#, fuzzy
msgid "reinstall a package"
msgstr "Mencari %d pakej"
-#: ../yummain.py:41
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1060
+#, fuzzy
+msgid "Setting up Downgrade Process"
+msgstr "&Tetapan Halaman"
+
+#: ../yumcommands.py:1067
+#, fuzzy
+msgid "downgrade a package"
+msgstr "Mencari %d pakej"
+
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
msgstr ""
-#: ../yummain.py:47
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr "Kumpulan: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Pelihat Pakej"
+
+#: ../yumcommands.py:1152
+#, fuzzy
+msgid "Installed:"
+msgstr "[pasang: %s]"
+
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "[pasang: %s]"
+
+#: ../yumcommands.py:1166
+#, fuzzy
+msgid "Available:"
+msgstr "Form&at yang ada:"
+
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Form&at yang ada:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
+
+#: ../yummain.py:128
+msgid "Running"
msgstr ""
-#: ../yummain.py:105
+#: ../yummain.py:129
+msgid "Sleeping"
+msgstr ""
+
+#: ../yummain.py:130
+msgid "Uninteruptable"
+msgstr ""
+
+#: ../yummain.py:131
+msgid "Zombie"
+msgstr ""
+
+#: ../yummain.py:132
+msgid "Traced/Stopped"
+msgstr ""
+
+#: ../yummain.py:137
+msgid " The other application is: PackageKit"
+msgstr ""
+
+#: ../yummain.py:139
+#, python-format
+msgid " The other application is: %s"
+msgstr ""
+
+#: ../yummain.py:142
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr ""
+
+#: ../yummain.py:146
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr ""
+
+#: ../yummain.py:148
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr ""
+
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
-#: ../yummain.py:132 ../yummain.py:171
+#: ../yummain.py:201 ../yummain.py:240
#, fuzzy, python-format
msgid "Error: %s"
msgstr "Ralat KMail"
-#: ../yummain.py:142 ../yummain.py:178
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr ""
#. Depsolve stage
-#: ../yummain.py:149
+#: ../yummain.py:218
#, fuzzy
msgid "Resolving Dependencies"
msgstr "&Cari Bantuan"
-#: ../yummain.py:184
+#: ../yummain.py:242
+msgid " You could try using --skip-broken to work around the problem"
+msgstr ""
+
+#: ../yummain.py:243
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+
+#: ../yummain.py:259
#, fuzzy
msgid ""
"\n"
"Dependencies Resolved"
msgstr "dikemaskini pada %(date)s"
-#: ../yummain.py:198
-msgid "Complete!"
-msgstr ""
-
-#: ../yummain.py:245
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1156,687 +1685,741 @@ msgstr ""
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/depsolve.py:95
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr ""
-#: ../yum/depsolve.py:136
+#: ../yum/depsolve.py:148
#, fuzzy, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Bersihkan Semua _Yum"
-#: ../yum/depsolve.py:147
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr ""
-#: ../yum/depsolve.py:170
+#: ../yum/depsolve.py:175
#, fuzzy, python-format
msgid "Potential match for %s from %s"
msgstr "Senarai untuk"
-#: ../yum/depsolve.py:178
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr ""
-#: ../yum/depsolve.py:219
+#: ../yum/depsolve.py:224
#, fuzzy, python-format
msgid "Member: %s"
msgstr "Pelayan: %s"
-#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, fuzzy, python-format
msgid "%s converted to install"
msgstr "Akan Memasang"
-#: ../yum/depsolve.py:240
+#: ../yum/depsolve.py:245
#, fuzzy, python-format
msgid "Adding Package %s in mode %s"
msgstr "Lihat dokumen dalam mod skrin penuh"
-#: ../yum/depsolve.py:250
+#: ../yum/depsolve.py:255
#, fuzzy, python-format
msgid "Removing Package %s"
msgstr "Pelihat Pakej"
-#: ../yum/depsolve.py:261
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr ""
-#: ../yum/depsolve.py:312
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr ""
-#: ../yum/depsolve.py:322
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr ""
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr ""
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr ""
-#: ../yum/depsolve.py:356
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr ""
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr ""
-#: ../yum/depsolve.py:372
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr ""
-#: ../yum/depsolve.py:388
+#: ../yum/depsolve.py:417
#, fuzzy, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "&Cari Bantuan"
+#: ../yum/depsolve.py:440
+#, python-format
+msgid "Quick matched %s to require for %s"
+msgstr ""
+
#. is it already installed?
-#: ../yum/depsolve.py:434
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
-#: ../yum/depsolve.py:449
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
-#: ../yum/depsolve.py:460
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
-#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr ""
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr ""
-#: ../yum/depsolve.py:510
-#, python-format
-msgid ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr ""
-
-#: ../yum/depsolve.py:537
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr ""
-#: ../yum/depsolve.py:544
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr ""
-#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
#, fuzzy
msgid "Success - empty transaction"
msgstr "Cipta dokumen kosong"
-#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr ""
-#: ../yum/depsolve.py:702
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr ""
-#: ../yum/depsolve.py:708
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr ""
-#: ../yum/depsolve.py:715
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr ""
-#: ../yum/depsolve.py:729
+#: ../yum/depsolve.py:782
#, fuzzy, python-format
msgid "Checking deps for %s"
msgstr "&Cari Bantuan"
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr ""
-#: ../yum/depsolve.py:933
-#, python-format
-msgid "Comparing best: %s to po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:937
-#, python-format
-msgid "Same: best %s == po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
-#, python-format
-msgid "best %s obsoletes po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:955
+#: ../yum/depsolve.py:1007
#, python-format
-msgid "po %s obsoletes best: %s"
+msgid "Running compare_providers() for %s"
msgstr ""
-#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, fuzzy, python-format
msgid "better arch in po %s"
msgstr "mencari pakej %s"
-#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
-#, python-format
-msgid "po %s shares a sourcerpm with %s"
-msgstr ""
+#: ../yum/depsolve.py:1142
+#, fuzzy, python-format
+msgid "%s obsoletes %s"
+msgstr "&Cari Bantuan"
-#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:1154
#, python-format
-msgid "best %s shares a sourcerpm with %s"
+msgid ""
+"archdist compared %s to %s on %s\n"
+" Winner: %s"
msgstr ""
-#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:1161
#, python-format
-msgid "po %s shares more of the name prefix with %s"
+msgid "common sourcerpm %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1167
#, python-format
-msgid "po %s has a shorter name than best %s"
+msgid "common prefix of %s between %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1175
#, python-format
-msgid "bestpkg %s shares more of the name prefix with %s"
+msgid "Best Order: %s"
msgstr ""
-#: ../yum/__init__.py:119
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:296
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr ""
-#: ../yum/__init__.py:332
+#: ../yum/__init__.py:450
#, fuzzy
msgid "plugins already initialised"
msgstr "Nyahaktif semua plugin"
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:349
+#: ../yum/__init__.py:468
#, fuzzy
msgid "Reading Local RPMDB"
msgstr "Layari Rangkaian Tempatan"
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:387
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:404
+#: ../yum/__init__.py:539
#, fuzzy
msgid "Setting up Package Sacks"
msgstr "Membersihkan pakej"
-#: ../yum/__init__.py:447
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr ""
-#: ../yum/__init__.py:448
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr ""
-#: ../yum/__init__.py:453
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:465
+#: ../yum/__init__.py:602
#, fuzzy
msgid "Building updates object"
msgstr "Salin Objek Embed"
-#: ../yum/__init__.py:496
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:520
+#: ../yum/__init__.py:662
#, fuzzy
msgid "Getting group metadata"
msgstr "Mendapatkan akaun CVS"
-#: ../yum/__init__.py:546
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr ""
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr ""
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr ""
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr ""
-#: ../yum/__init__.py:657
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+
+#: ../yum/__init__.py:853
#, fuzzy, python-format
msgid "Skip-broken round %i"
msgstr "Langkau soalselidik pengguna"
-#: ../yum/__init__.py:680
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr ""
-#: ../yum/__init__.py:681
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
msgstr ""
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr ""
-#: ../yum/__init__.py:774
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+
+#: ../yum/__init__.py:1101
#, fuzzy, python-format
msgid "Failed to remove transaction file %s"
msgstr "Gagal untuk mencari seksyen: %s"
-#: ../yum/__init__.py:814
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr ""
-
-#: ../yum/__init__.py:845
-msgid "Excluding Packages in global exclude list"
+msgid "%s was supposed to be installed but is not!"
msgstr ""
-#: ../yum/__init__.py:847
-#, fuzzy, python-format
-msgid "Excluding Packages from %s"
-msgstr "Selit MathML dari fail"
-
-#: ../yum/__init__.py:875
-#, fuzzy, python-format
-msgid "Reducing %s to included packages only"
-msgstr "Stat pakej Mandriva Linux"
-
-#: ../yum/__init__.py:880
-#, fuzzy, python-format
-msgid "Keeping included package %s"
-msgstr "Fail Pakej RPM"
-
-#: ../yum/__init__.py:886
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Removing unmatched package %s"
-msgstr "Membuang pakej tidak sepadan %s"
-
-#: ../yum/__init__.py:889
-msgid "Finished"
+msgid "%s was supposed to be removed but is not!"
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:919
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr ""
#. Another copy seems to be running.
-#: ../yum/__init__.py:923
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr ""
-#: ../yum/__init__.py:970 ../yum/__init__.py:977
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr ""
-#: ../yum/__init__.py:991
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Tidak dapat melaksanakan checksum"
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr ""
-#: ../yum/__init__.py:1036
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "menggunakan salinan tempatan bagi %s"
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1477
#, python-format
-msgid "Insufficient space in download directory %s to download"
+msgid ""
+"Insufficient space in download directory %s\n"
+" * free %s\n"
+" * needed %s"
msgstr ""
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Pengepala tidak lengkap."
-#: ../yum/__init__.py:1134
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-#: ../yum/__init__.py:1189
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr ""
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Masalah membuka pakej %s"
-#: ../yum/__init__.py:1201
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr ""
-#: ../yum/__init__.py:1205
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Pakej %s tidak ditandatangan"
-#: ../yum/__init__.py:1243
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Tidak dapat membuang %s"
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr ""
-#: ../yum/__init__.py:1283
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Tidak dapat membuang %s fail %s"
-#: ../yum/__init__.py:1287
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s fail %s dibuang"
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s fail dibuang"
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: ../yum/__init__.py:1335
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr ""
-#: ../yum/__init__.py:1543
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Mencari %d pakej"
-#: ../yum/__init__.py:1584
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "mencari pakej %s"
-#: ../yum/__init__.py:1596
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr ""
-#: ../yum/__init__.py:1603
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr ""
-#: ../yum/__init__.py:1633
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Padanan Menyediakan: %s"
-#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#: ../yum/__init__.py:2170
+msgid "No group data available for configured repositories"
+msgstr ""
+
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr ""
-#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr ""
-#: ../yum/__init__.py:1770
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr ""
-#: ../yum/__init__.py:1774
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr ""
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
-msgid "Invalid versioned dependency string, try quoting it."
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Bendera versi tidak sah"
-#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Tiada Pakej dijumpai untuk %s"
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr ""
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr ""
-#. only one in there
-#: ../yum/__init__.py:2085
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr ""
-#. FIXME - this is where we could check to see if it already installed
-#. for returning better errors
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2798
+#, fuzzy, python-format
+msgid "Package %s installed and not available"
+msgstr "Pakej %s tidak ditandatangan"
+
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr ""
-#: ../yum/__init__.py:2158
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr ""
-#: ../yum/__init__.py:2171
+#: ../yum/__init__.py:2839
+#, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr ""
+
+#: ../yum/__init__.py:2842
+#, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr ""
+
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr ""
-#: ../yum/__init__.py:2178
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
#. update everything (the easy case)
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Mengemaskini Semuanya"
-#: ../yum/__init__.py:2304
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:2377
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:3093
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Selit MathML dari fail"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Tidak dapat membuka fail: %s. Melangkau."
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Memeriksa %s: %s"
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-#: ../yum/__init__.py:2468
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr ""
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Menanda %s untuk dipasang"
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr ""
-#: ../yum/__init__.py:2486
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr ""
-#: ../yum/__init__.py:2504
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2515
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr ""
-#: ../yum/__init__.py:2522
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, python-format
+msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:3515
+#, fuzzy
+msgid "No package(s) available to downgrade"
+msgstr "Fail Pakej RPM"
+
+#: ../yum/__init__.py:3559
+#, fuzzy, python-format
+msgid "No Match for available package: %s"
+msgstr "Form&at yang ada:"
+
+#: ../yum/__init__.py:3565
+#, fuzzy, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Form&at yang ada:"
+
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Saiz lajur automatik"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr ""
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr ""
-#: ../yum/__init__.py:2589
-msgid "GPG key parsing failed: "
+#: ../yum/__init__.py:3735
+#, python-format
+msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
-#: ../yum/__init__.py:2593
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr ""
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr ""
-#: ../yum/__init__.py:2610
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Tidak memasang kekunci"
-#: ../yum/__init__.py:2616
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr ""
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Kekunci berjaya diimport"
-#: ../yum/__init__.py:2624
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1844,106 +2427,148 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: ../yum/__init__.py:2633
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: ../yum/__init__.py:2707
+#: ../yum/__init__.py:3829
+#, python-format
+msgid "GPG key at %s (0x%s) is already imported"
+msgstr ""
+
+#: ../yum/__init__.py:3849
+#, fuzzy, python-format
+msgid "Not installing key for repo %s"
+msgstr "Tidak memasang kekunci"
+
+#: ../yum/__init__.py:3854
+#, fuzzy
+msgid "Key import failed"
+msgstr "Kekunci berjaya diimport"
+
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr ""
-#: ../yum/__init__.py:2709
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:2774
+#: ../yum/__init__.py:4028
+#, python-format
+msgid "Please report this error at %s"
+msgstr ""
+
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Ralat Ujian Transaksi:"
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:195
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr ""
-#: ../yum/plugins.py:206
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr ""
-#: ../yum/plugins.py:219
+#: ../yum/plugins.py:252
+#, python-format
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr ""
+
+#. Give full backtrace:
+#: ../yum/plugins.py:264
#, python-format
-msgid "\"%s\" plugin is disabled"
+msgid "Plugin \"%s\" can't be imported"
msgstr ""
-#: ../yum/plugins.py:231
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr ""
-#: ../yum/plugins.py:235
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr ""
-#: ../yum/plugins.py:264
+#: ../yum/plugins.py:309
#, fuzzy, python-format
msgid "Loading \"%s\" plugin"
msgstr "Nyahaktif semua plugin"
-#: ../yum/plugins.py:271
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr ""
-#: ../yum/plugins.py:291
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr ""
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:294
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr ""
-#: ../yum/plugins.py:448
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr ""
-#: ../rpmUtils/oldUtils.py:26
+#: ../yum/rpmtrans.py:78
+#, fuzzy
+msgid "Repackaging"
+msgstr "Pelihat Pakej"
+
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr ""
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr ""
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr ""
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr ""
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Pengepala Rosak %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Ralat membuka rpm %s - ralat %s"
#, fuzzy
-#~ msgid "Looking for Obsoletes for %s"
-#~ msgstr "&Cari Bantuan"
+#~ msgid "Excluding Packages from %s"
+#~ msgstr "Selit MathML dari fail"
+
+#, fuzzy
+#~ msgid "Reducing %s to included packages only"
+#~ msgstr "Stat pakej Mandriva Linux"
+
+#, fuzzy
+#~ msgid "Keeping included package %s"
+#~ msgstr "Fail Pakej RPM"
+
+#~ msgid "Removing unmatched package %s"
+#~ msgstr "Membuang pakej tidak sepadan %s"
#, fuzzy
#~ msgid "%s conflicts with %s"
diff --git a/po/nb.po b/po/nb.po
index 583a57e..c699e4e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum 3.2.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-08 03:17+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-07-10 15:03+0200\n"
"Last-Translator: Sindre Wetjen <sindre.w@gmail.com>\n"
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:939 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Oppdaterer"
@@ -25,7 +25,7 @@ msgstr "Oppdaterer"
msgid "Erasing"
msgstr "Fjerner"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:938
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installerer"
@@ -34,15 +34,16 @@ msgstr "Installerer"
msgid "Obsoleted"
msgstr "Utgått"
-#: ../callback.py:54 ../output.py:1060
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Oppdatert"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Fjernet"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1058
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Installert"
@@ -64,7 +65,7 @@ msgstr "Feil: ugyldig tilstand ut: %s for %s"
msgid "Erased: %s"
msgstr "Fjernet: %s"
-#: ../callback.py:217 ../output.py:940
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Fjerner"
@@ -72,60 +73,60 @@ msgstr "Fjerner"
msgid "Cleanup"
msgstr "Rydder opp"
-#: ../cli.py:107
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Kommando «%s» er allerede definert"
-#: ../cli.py:119
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Konfigurerer lagre"
-#: ../cli.py:130
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Leser inn data om lager fra lokale filer"
-#: ../cli.py:193 ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Feil i konfigurasjon: %s"
-#: ../cli.py:196 ../cli.py:1242 ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Feil i flagg: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr "Installert: %s-%s til %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Bygd : %s til %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr "Sendt inn: %s til %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Du må oppgi en kommando"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Krav til disk:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr "Minst %dMB kreves på filsystem %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -133,56 +134,64 @@ msgstr ""
"Sammendrag for feil\n"
"---------------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Prøver å kjøre transaksjonen, men den er tom. Avslutter."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Avslutter på grunn av kommando fra bruker"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Laster ned pakker:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Kunne ikke laste ned pakkene:\n"
-#: ../cli.py:420 ../yum/__init__.py:3776
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Kjører rpm_check_debug"
-#: ../cli.py:423 ../yum/__init__.py:3779
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "FEIL med rpm_check_debug i forhold til løsing av avhengigheter:"
-#: ../cli.py:427
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Vennligst rapporter denne feilen i %s"
-#: ../cli.py:433
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Kjører test på transaksjonen"
-#: ../cli.py:449
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Transaksjonstesten er fullført"
-#: ../cli.py:451
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Feil ved test av transaksjonen:\n"
-#: ../cli.py:458
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Test av transaksjonen var vellykket"
-#: ../cli.py:480
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Utfører transaksjonen"
-#: ../cli.py:510
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -190,79 +199,79 @@ msgstr ""
"Nekter å importere nøkler automatisk ved kjøring uten oppsyn.\n"
"Bruk «-y» for å overstyre."
-#: ../cli.py:529 ../cli.py:563
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Du mente kanskje:"
-#: ../cli.py:546 ../cli.py:554
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Pakken(e) %s%s%s er tilgjengelig, men ikke installert."
-#: ../cli.py:560 ../cli.py:591 ../cli.py:669
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Pakke %s%s%s er ikke tilgjengelig."
-#: ../cli.py:596 ../cli.py:729
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Pakke(r) som skal installeres"
-#: ../cli.py:597 ../cli.py:675 ../cli.py:708 ../cli.py:730
-#: ../yumcommands.py:157
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Ingenting å gjøre"
-#: ../cli.py:630
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pakker merket for oppdatering"
-#: ../cli.py:633
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Ingen pakker merket for oppdatering"
-#: ../cli.py:647
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pakker merket for fjerning"
-#: ../cli.py:650
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Ingen pakker merket for fjerning"
-#: ../cli.py:674
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Pakke(r) som skal nedgraderes"
-#: ../cli.py:698
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (fra %s)"
-#: ../cli.py:700
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Den installerte pakken %s%s%s%s er ikke tilgjengelig."
-#: ../cli.py:707
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Pakke(r) som skal ominstalleres"
-#: ../cli.py:720
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Ingen pakker ble tilbudt"
-#: ../cli.py:804
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Advarsel: Ingen treff funnet for: %s"
-#: ../cli.py:807
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Fant ingen treff"
-#: ../cli.py:846
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -271,109 +280,109 @@ msgstr ""
"Advarsel: 3.0.x versjonen av yum vil feilaktig samsvare mot filnavnene.\n"
" Du kan bruke \"%s*/%s%s\" og/eller \"%s*bin/%s%s\" for å få den oppførselen."
-#: ../cli.py:862
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Ingen pakke ble funnet for %s"
-#: ../cli.py:874
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Rydder opp alt"
-#: ../cli.py:888
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Rydder opp pakkehoder"
-#: ../cli.py:891
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Rydder opp pakker"
-#: ../cli.py:894
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Rydder opp i XML-metadata"
-#: ../cli.py:897
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Rydder opp i mellomlager for database"
-#: ../cli.py:900
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Rydder opp i metadata for expire-cache"
-#: ../cli.py:903
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Rydder opp i programtillegg"
-#: ../cli.py:928
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Installerte grupper:"
-#: ../cli.py:940
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Tilgjengelig grupper:"
-#: ../cli.py:950
+#: ../cli.py:959
msgid "Done"
msgstr "Ferdig"
-#: ../cli.py:961 ../cli.py:979 ../cli.py:985 ../yum/__init__.py:2525
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Advarsel: Gruppe %s eksisterer ikke."
-#: ../cli.py:989
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Ingen pakker tilgjengelig for installering eller oppdatering i aktuelle "
"grupper"
-#: ../cli.py:991
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pakke(r) vil bli installert"
-#: ../cli.py:1001 ../yum/__init__.py:2537
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Det finnes ingen gruppe med navn %s"
-#: ../cli.py:1007
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Ingen pakker å fjerne fra grupper"
-#: ../cli.py:1009
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pakker vil bli fjernet"
-#: ../cli.py:1051
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Pakke %s er allerede lagt inn, hopper over"
-#: ../cli.py:1062
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Vraker pakke som ikke kan sammenlignes %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1088
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Ingen annen %s er lagt inn, legger til pakke til liste over potensielle "
"pakker"
-#: ../cli.py:1108
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Programtilleggs valg"
-#: ../cli.py:1116
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Feil med kommandolinje: %s"
-#: ../cli.py:1129
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -384,257 +393,257 @@ msgstr ""
"\n"
"%s: flagg %s krever et argument"
-#: ../cli.py:1182
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color tar et av: auto, alltid, aldri"
-#: ../cli.py:1289
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "vis denne hjelpteksten og avslutt"
-#: ../cli.py:1293
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "vær tolerant ved feil"
-#: ../cli.py:1295
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "bruk kun lagrede filer ved kjøring, ikke oppdater lagrede filer"
-#: ../cli.py:1297
+#: ../cli.py:1306
msgid "config file location"
msgstr "plassering av konfigurasjonsfil"
-#: ../cli.py:1299
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "maksimaltid for å vente på kommando"
-#: ../cli.py:1301
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "nivå for tilbakemeldinger ved avlusing"
-#: ../cli.py:1305
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "vis duplikater i lager og i kommandoer for å liste/søke i pakker"
-#: ../cli.py:1307
+#: ../cli.py:1316
msgid "error output level"
msgstr "mengde tilbakemelding ved feil"
-#: ../cli.py:1310
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "stille operasjon"
-#: ../cli.py:1312
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "vis ekstra informasjon"
-#: ../cli.py:1314
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "svar Ja til alle spørsmål"
-#: ../cli.py:1316
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "vis Yum-versjon og avslutt"
-#: ../cli.py:1317
+#: ../cli.py:1326
msgid "set install root"
msgstr "sett rot for installasjonen"
-#: ../cli.py:1321
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "legger til et eller flere lager (jokertegn er tillatt)"
-#: ../cli.py:1325
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "slå av et eller flere lager (jokertegn er tillatt)"
-#: ../cli.py:1328
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "overse pakke(r) ved navn eller mønster"
-#: ../cli.py:1330
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "fjerner ekskludering av pakker, for et lager eller alle pakker"
-#: ../cli.py:1333
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "ta med foreldede pakker i beregningen ved oppdatering"
-#: ../cli.py:1335
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "ikke bruk programtilleggene til Yum"
-#: ../cli.py:1337
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "ikke sjekk GPG-signaturer"
-#: ../cli.py:1339
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "slå av tillegg til yum etter navn"
-#: ../cli.py:1342
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "slå av programtillegg til yum etter navn"
-#: ../cli.py:1345
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "hopp over pakker som har problemer med avhengigheter"
-#: ../cli.py:1347
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "kontroller om farger er brukt"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jan"
msgstr "jan"
-#: ../output.py:303
+#: ../output.py:305
msgid "Feb"
msgstr "feb"
-#: ../output.py:303
+#: ../output.py:305
msgid "Mar"
msgstr "mar"
-#: ../output.py:303
+#: ../output.py:305
msgid "Apr"
msgstr "apr"
-#: ../output.py:303
+#: ../output.py:305
msgid "May"
msgstr "mai"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jun"
msgstr "jun"
-#: ../output.py:304
+#: ../output.py:306
msgid "Jul"
msgstr "jul"
-#: ../output.py:304
+#: ../output.py:306
msgid "Aug"
msgstr "aug"
-#: ../output.py:304
+#: ../output.py:306
msgid "Sep"
msgstr "sep"
-#: ../output.py:304
+#: ../output.py:306
msgid "Oct"
msgstr "okt"
-#: ../output.py:304
+#: ../output.py:306
msgid "Nov"
msgstr "nov"
-#: ../output.py:304
+#: ../output.py:306
msgid "Dec"
msgstr "des"
-#: ../output.py:314
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Prøver et annet speil."
-#: ../output.py:536
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Navn : %s%s%s"
-#: ../output.py:537
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Arkitektur : %s"
-#: ../output.py:539
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Epoch :%s"
-#: ../output.py:540
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Versjon : %s"
-#: ../output.py:541
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Utgave : %s"
-#: ../output.py:542
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Størrelse : %s"
-#: ../output.py:543
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Kilde : %s"
-#: ../output.py:545
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Fra arkiv : %s"
-#: ../output.py:547
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Ansvarlig : %s"
-#: ../output.py:548
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Utførelsestid : %s"
-#: ../output.py:549
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Byggetid : %s"
-#: ../output.py:551
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Installasjonstid: %s"
-#: ../output.py:552
+#: ../output.py:554
msgid "Summary : "
msgstr "Sammendrag :"
-#: ../output.py:554
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:555
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Lisens : %s"
-#: ../output.py:556
+#: ../output.py:558
msgid "Description: "
msgstr "Beskrivelse:"
-#: ../output.py:624
+#: ../output.py:626
msgid "y"
msgstr "j"
-#: ../output.py:624
+#: ../output.py:626
msgid "yes"
msgstr "ja"
-#: ../output.py:625
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:625
+#: ../output.py:627
msgid "no"
msgstr "nei"
-#: ../output.py:629
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "Er dette ok [j/N]:"
-#: ../output.py:720
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -643,141 +652,141 @@ msgstr ""
"\n"
"Gruppe:%s"
-#: ../output.py:724
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr "GruppeId:%s"
-#: ../output.py:729
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Beskrivelse: %s"
-#: ../output.py:731
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr "Obligatoriske pakker:"
-#: ../output.py:732
+#: ../output.py:734
msgid " Default Packages:"
msgstr "Standard pakker:"
-#: ../output.py:733
+#: ../output.py:735
msgid " Optional Packages:"
msgstr "Valgfrie pakker:"
-#: ../output.py:734
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr "Betingede pakker:"
-#: ../output.py:754
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "pakke: %s"
-#: ../output.py:756
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Ingen avhengigheter for denne pakka"
-#: ../output.py:761
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " avhengighet: %s"
-#: ../output.py:763
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " avhengighet som ikke kunne tilfredstilles"
-#: ../output.py:835
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Arkiv : %s"
-#: ../output.py:836
+#: ../output.py:838
msgid "Matched from:"
msgstr "Treff fra:"
-#: ../output.py:845
+#: ../output.py:847
msgid "Description : "
msgstr "Beskrivelse : "
-#: ../output.py:848
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "Nettadresse : %s"
-#: ../output.py:851
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Lisens : %s"
-#: ../output.py:854
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Filnavn : %s"
-#: ../output.py:858
+#: ../output.py:860
msgid "Other : "
msgstr "Andre ting : %s"
-#: ../output.py:891
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "Kunne ikke finne ut størrelse på det som skal hentes ned"
-#: ../output.py:896
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Totale størrelse: %s"
-#: ../output.py:899
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Totale størrelse på pakker som hentes: %s"
-#: ../output.py:941
+#: ../output.py:942
msgid "Reinstalling"
msgstr "Ominstallerer"
-#: ../output.py:942
+#: ../output.py:943
msgid "Downgrading"
msgstr "Nedgraderer"
-#: ../output.py:943
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Legges inn på grunn avhengigheter"
-#: ../output.py:944
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Oppdateres på grunn avhengigheter"
-#: ../output.py:945
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Fjernes på grunn avhengigheter"
-#: ../output.py:952 ../output.py:1062
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Hoppet over (problemer med avhengigheter)"
-#: ../output.py:973
+#: ../output.py:976
msgid "Package"
msgstr "Pakke"
-#: ../output.py:973
+#: ../output.py:976
msgid "Arch"
msgstr "Arkitektur"
-#: ../output.py:974
+#: ../output.py:977
msgid "Version"
msgstr "Versjon"
-#: ../output.py:974
+#: ../output.py:977
msgid "Repository"
msgstr "Pakkeoversikt"
-#: ../output.py:975
+#: ../output.py:978
msgid "Size"
msgstr "Størrelse"
-#: ../output.py:987
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -786,7 +795,7 @@ msgstr ""
" erstatter %s%s%s.%s %s\"\n"
"\n"
-#: ../output.py:996
+#: ../output.py:999
#, python-format
msgid ""
"\n"
@@ -797,7 +806,7 @@ msgstr ""
"Transaksjonsammendrag\n"
"%s\n"
-#: ../output.py:1003
+#: ../output.py:1006
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
@@ -806,7 +815,7 @@ msgstr ""
"Installer %5.5s Pakke(r)\n"
"Oppgradere %5.5s Pakke(r)\n"
-#: ../output.py:1012
+#: ../output.py:1015
#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
@@ -817,32 +826,32 @@ msgstr ""
"Ominstaller %5.5s Pakke(r)\n"
"Nedgrader %5.5s Pakke(r)\n"
-#: ../output.py:1056
+#: ../output.py:1059
msgid "Removed"
msgstr "Fjernet"
-#: ../output.py:1057
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Fjernet på grunn avhengighet"
-#: ../output.py:1059
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Lagt inn på grunn av avhengighet"
-#: ../output.py:1061
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Oppdatert på grunn avhengighet"
-#: ../output.py:1063
+#: ../output.py:1066
msgid "Replaced"
msgstr "Erstattet"
-#: ../output.py:1064
+#: ../output.py:1067
msgid "Failed"
msgstr "Feilet"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1130
+#: ../output.py:1133
msgid "two"
msgstr "to"
@@ -850,7 +859,7 @@ msgstr "to"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1141
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
@@ -863,76 +872,254 @@ msgstr ""
"til innen %s%s%s sekunder\n"
"for å avslutte.\n"
-#: ../output.py:1152
+#: ../output.py:1155
msgid "user interrupt"
msgstr "avbrutt av bruker"
-#: ../output.py:1168
+#: ../output.py:1173
msgid "Total"
msgstr "Totalt"
-#: ../output.py:1183
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Utfører transaksjonen"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Feil ved test av transaksjonen:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Andre ting : %s"
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "Nettadresse : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#, fuzzy
+msgid "Return-Code :"
+msgstr "ID for arkiv: "
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Utgått"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Feilet"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Feil ved test av transaksjonen:\n"
+
+#: ../output.py:1405
+#, fuzzy
+msgid "Downgraded"
+msgstr "Nedgraderer"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Ingen pakker ble tilbudt"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Feil: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "installert"
-#: ../output.py:1184
+#: ../output.py:1525
msgid "updated"
msgstr "oppdatert"
-#: ../output.py:1185
+#: ../output.py:1526
msgid "obsoleted"
msgstr "foreldet"
-#: ../output.py:1186
+#: ../output.py:1527
msgid "erased"
msgstr "fjernet"
-#: ../output.py:1190
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> pakke %s.%s %s:%s-%s er satt til %s"
-#: ../output.py:1197
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Utfører sjekk av transaksjonen"
-#: ../output.py:1202
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Starter løsing av avhengigheter på nytt med endringer"
-#: ../output.py:1207
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Alle avhengigheter er løst"
-#: ../output.py:1212 ../output.py:1217
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Beregner avhengighet: %s for pakke: %s"
-#: ../output.py:1221
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Avhengigheter som ikke kunne bli tilfredstilt: %s"
-#: ../output.py:1227 ../output.py:1232
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Beregner konflikter: %s er i konflikt med %s"
-#: ../output.py:1236
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Fyller transaksjonen med valgte pakker. Vennligst vent."
-#: ../output.py:1240
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Henter ned filhode for pakke %s for å fylle transaksjonen."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Avslutter etter ønske"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Avslutter på grunn av brutt rør"
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Ferdig!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Du må være rootbruker for å utføre denne kommandoen."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -961,314 +1148,349 @@ msgstr ""
"\n"
"Kontakt din distribusjon eller pakkeansvarlig for mer informasjon.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Feil: du må oppgi en liste med pakker som skal %s"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Feil: trenger noe å sammenligne med"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Feil: trenger en gruppe eller en liste med grupper"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Feil: clean trenger minst et argument: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Feil: ugyldig argument gitt til kommandoen clean: %r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Ingen argumenter ble gitt til kommandoen shell"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Følgende filnavn ble sendt til skallet: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
"Filen %s som ble gitt som argument til kommandoen shell eksisterer ikke."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr "Feil: mer enn en fil ble gitt som argument til kommandoen shell."
-#: ../yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAKKE..."
-#: ../yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Legg inn en eller flere pakker på systemet"
-#: ../yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Forberedelser for installasjon"
-#: ../yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAKKE...]"
-#: ../yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Oppdater en eller flere pakker på systemet"
-#: ../yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Forberedelser for oppdatering"
-#: ../yumcommands.py:244
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Viser detaljer om en pakke eller en gruppe av grupper"
-#: ../yumcommands.py:293
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Pakker som er installert"
-#: ../yumcommands.py:301
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Tilgjengelige pakker"
-#: ../yumcommands.py:305
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Tilleggspakker"
-#: ../yumcommands.py:309
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Oppdaterte pakker"
#. This only happens in verbose mode
-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:600
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Utdaterte pakker"
-#: ../yumcommands.py:326
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Pakker som nylig er lagt til"
-#: ../yumcommands.py:333
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Ingen passende pakker å liste opp"
-#: ../yumcommands.py:347
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Lag en liste med pakker eller grupper av pakker"
-#: ../yumcommands.py:359
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Fjern en eller flere pakker fra systemet"
-#: ../yumcommands.py:366
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Klargjør for fjerning av pakker"
-#: ../yumcommands.py:380
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Klargjør grupper med pakker"
-#: ../yumcommands.py:386
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Ingen gruppe er valgt for aktuell kommando"
-#: ../yumcommands.py:399
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Lag liste over tilgjengelige pakkegrupper"
-#: ../yumcommands.py:416
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Legger inn pakkene i en gruppe på systemet"
-#: ../yumcommands.py:438
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Fjern pakkene i en gruppe fra systemet"
-#: ../yumcommands.py:465
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Viser detaljer om en gruppe av pakker"
-#: ../yumcommands.py:489
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Lag mellomlager med metadata"
-#: ../yumcommands.py:495
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Lager mellomlager for samtlige filer med metadata."
-#: ../yumcommands.py:496
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr "Dette kan en stund avhengig av hvor rask datamaskinen er"
-#: ../yumcommands.py:517
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Mellomlager er ferdig lagd"
-#: ../yumcommands.py:531
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Fjern mellomlager med metadata"
-#: ../yumcommands.py:551
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Finn hvilken pakke som inneholder etterspurt verdi"
-#: ../yumcommands.py:571
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Se etter tilgjengelige pakkeoppdateringer"
-#: ../yumcommands.py:620
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Søker etter oppgitt streng i pakkedetaljene"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Søker i pakker: "
-#: ../yumcommands.py:643
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Oppdater pakker og ta hensyn til pakker som blir utdatert"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Klargjør for oppdatering"
-#: ../yumcommands.py:665
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Legger inn en RPM fra filsystemet"
-#: ../yumcommands.py:673
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Klargjøring for pakker på lokalt filsystem"
-#: ../yumcommands.py:692
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Finner hvilken pakke som tilbyr den gitte avhengigheten"
-#: ../yumcommands.py:695
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Søker i pakker etter avhengighet:"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Kjører det interaktive Yum-skallet"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Klargjør Yum-skallet"
-#: ../yumcommands.py:733
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Vis avhengigheter for en pakke"
-#: ../yumcommands.py:739
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Finner avhengigheter: "
-#: ../yumcommands.py:755
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Viser de pakkeoversiktene som er satt opp"
-#: ../yumcommands.py:803 ../yumcommands.py:804
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "aktiv"
-#: ../yumcommands.py:812 ../yumcommands.py:813
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "inaktiv"
-#: ../yumcommands.py:827
-msgid "Repo-id : "
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
msgstr "ID for arkiv: "
-#: ../yumcommands.py:828
-msgid "Repo-name : "
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
msgstr "Navn på arkiv : "
-#: ../yumcommands.py:829
-msgid "Repo-status : "
+#: ../yumcommands.py:836
+#, fuzzy
+msgid "Repo-status : "
msgstr "Arkivstatus : "
-#: ../yumcommands.py:831
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Arkivrevisjon: "
-#: ../yumcommands.py:835
-msgid "Repo-tags : "
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
msgstr "Arkivmerkelapper : "
# Har noen et bedre forslag? Dette ser bare stygt ut.
-#: ../yumcommands.py:841
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Arkivdistribusjonsmerkelapper:"
-#: ../yumcommands.py:846
-msgid "Repo-updated: "
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
msgstr "Arkivaktivitet:"
-#: ../yumcommands.py:848
-msgid "Repo-pkgs : "
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
msgstr "Arkivpakker : "
-#: ../yumcommands.py:849
-msgid "Repo-size : "
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
msgstr "Størrelse på arkiv : "
-#: ../yumcommands.py:856
-msgid "Repo-baseurl: "
+#: ../yumcommands.py:863
+#, fuzzy
+msgid "Repo-baseurl : "
msgstr "Arkivets basisurl : "
-#: ../yumcommands.py:864
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Arkivmetalink: "
-#: ../yumcommands.py:868
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Oppdatert : "
-#: ../yumcommands.py:871
-msgid "Repo-mirrors: "
+#: ../yumcommands.py:878
+#, fuzzy
+msgid "Repo-mirrors : "
msgstr "Arkivspeil: "
-#: ../yumcommands.py:875
-msgid "Repo-exclude: "
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, fuzzy, python-format
+msgid "Instant (last: %s)"
+msgstr "Installasjonstid: %s"
+
+#: ../yumcommands.py:893
+#, fuzzy, python-format
+msgid "%s second(s) (last: %s)"
+msgstr "%s er i konflikt med: %s"
+
+#: ../yumcommands.py:895
+#, fuzzy
+msgid "Repo-expire : "
+msgstr "Størrelse på arkiv : "
+
+#: ../yumcommands.py:898
+#, fuzzy
+msgid "Repo-exclude : "
msgstr "Arkivekskludert: "
-#: ../yumcommands.py:879
-msgid "Repo-include: "
+#: ../yumcommands.py:902
+#, fuzzy
+msgid "Repo-include : "
msgstr "Arkivinkludert: "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:889 ../yumcommands.py:915
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "arkiv id"
-#: ../yumcommands.py:903 ../yumcommands.py:904 ../yumcommands.py:918
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "status"
-#: ../yumcommands.py:916
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "arkiv navn"
-#: ../yumcommands.py:942
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Viser en hjelpetekst"
-#: ../yumcommands.py:976
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Ingen hjelp er tilgjengelig for %s"
-#: ../yumcommands.py:981
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1278,7 +1500,7 @@ msgstr ""
"\n"
"alias:"
-#: ../yumcommands.py:983
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1288,128 +1510,137 @@ msgstr ""
"\n"
"alias:"
-#: ../yumcommands.py:1011
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Klargjør for å legge inn pakke(r) på nytt"
-#: ../yumcommands.py:1019
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "ominstaller en pakke "
-#: ../yumcommands.py:1037
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Klargjør for oppdatering"
-#: ../yumcommands.py:1044
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "nedgrader en pakke"
-#: ../yumcommands.py:1058
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr "Vi sen versjon for maskinen og/eller tilgjengelige arkiver"
-#: ../yumcommands.py:1085
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr "GruppeId:%s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Pakke"
+
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "Installert:"
-#: ../yumcommands.py:1094
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Installert:"
+
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "Tilgjengelig:"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Tilgjengelig:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
msgstr ""
-"\n"
-"\n"
-"Avslutter etter ønske"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
msgstr ""
-"\n"
-"\n"
-"Avslutter på grunn av brutt rør"
-#: ../yummain.py:126
+#: ../yummain.py:128
msgid "Running"
msgstr "Kjører"
-#: ../yummain.py:127
+#: ../yummain.py:129
msgid "Sleeping"
msgstr "Sover"
-#: ../yummain.py:128
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "Ikke mulig å avbryte"
-#: ../yummain.py:129
+#: ../yummain.py:131
msgid "Zombie"
msgstr "Zombie"
-#: ../yummain.py:130
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr "Sporet/Stoppet"
-#: ../yummain.py:131
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: ../yummain.py:135
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " Det andre programmet er: PackageKit"
-#: ../yummain.py:137
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " Det andre programmet er: %s"
-#: ../yummain.py:140
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Minne : %5s RSS (%5sB VSZ)"
-#: ../yummain.py:144
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " Startet for %s - %s siden"
-#: ../yummain.py:146
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " Status : %s, pid: %d"
-#: ../yummain.py:171
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"Et annet program holder en fillås for Yum, venter til fillåsen frigjøres..."
-#: ../yummain.py:199 ../yummain.py:238
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Feil: %s"
-#: ../yummain.py:209 ../yummain.py:251
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Ukjent feil: feilkode: %d:"
#. Depsolve stage
-#: ../yummain.py:216
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "Løser avhengigheter"
-#: ../yummain.py:240
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
msgstr "Du kan prøve å bruke --skip-broken for å jobbe deg rundt problem"
-#: ../yummain.py:241
+#: ../yummain.py:243
msgid ""
" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
@@ -1419,7 +1650,7 @@ msgstr ""
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"
-#: ../yummain.py:257
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1427,11 +1658,7 @@ msgstr ""
"\n"
"Alle avhengigheter er løst"
-#: ../yummain.py:271
-msgid "Complete!"
-msgstr "Ferdig!"
-
-#: ../yummain.py:318
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1441,196 +1668,196 @@ msgstr ""
"\n"
"Avslutter etter ønske"
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() vil forsvinne i en kommende utgave av Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Setter opp transaksjons-sett før config klassen er klar"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Ugyldig tsflag in konfigurasjonsfil: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Søker i pkgSack etter avhengighet: %s"
-#: ../yum/depsolve.py:183
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Potensielt treff for %s i %s"
-#: ../yum/depsolve.py:191
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Passende %s for å tilfredstille %s"
-#: ../yum/depsolve.py:232
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Medlem: %s"
-#: ../yum/depsolve.py:246 ../yum/depsolve.py:759
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s ble omdannet til installering"
-#: ../yum/depsolve.py:253
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Legger til pakke %s in modus %s"
-#: ../yum/depsolve.py:263
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Fjerner pakke %s"
-#: ../yum/depsolve.py:285
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s krever: %s"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Nødvendig avhengighet har allerede blitt plukket opp, jukser"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Nødvendig avhengighet er ikke et navn på pakke. Ser etter: %s"
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Potensiell tilbyder: %s"
-#: ../yum/depsolve.py:383
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Modus er %s for tilbyder av %s: %s"
-#: ../yum/depsolve.py:387
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Modus for pakke som tilbyr %s: %s"
-#: ../yum/depsolve.py:391
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: pakke %s som er nødvendig for %s vil bli fjernet"
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: Bytter ut %s med %s for å løse opp i avhengighet."
-#: ../yum/depsolve.py:407
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Oppdaterer %s for å løse opp i avhengighet."
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Kunne ikke finne måte å oppdatere sti for avhengighet: %s."
-#: ../yum/depsolve.py:425
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Avhengighet %s kan ikke løses opp: %s"
-#: ../yum/depsolve.py:448
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Hurtigpasset %s for å tilfredstille %s"
#. is it already installed?
-#: ../yum/depsolve.py:490
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s tilbyr pakker, men er allerede installert, fjerner denne."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Pakke %s som potensielt løser opp avhengighet har nyere instans in ts."
-#: ../yum/depsolve.py:517
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Pakke %s som potensielt løser opp avhengighet er allerde installert."
-#: ../yum/depsolve.py:525 ../yum/depsolve.py:574
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Uløst avhengighet: %s trengs av pakke %s"
-#: ../yum/depsolve.py:538
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s er allerde i ts, hopper over denne"
-#: ../yum/depsolve.py:584
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Setter opp %s som oppdatering av %s"
-#: ../yum/depsolve.py:592
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Setter opp %s som pakke for installering av %s"
-#: ../yum/depsolve.py:695 ../yum/depsolve.py:777
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Suksess - transaksjonen er tom"
-#: ../yum/depsolve.py:734 ../yum/depsolve.py:749
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Starter sløyfe på nytt"
-#: ../yum/depsolve.py:765
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Beregning av avhengighet avsluttes"
-#: ../yum/depsolve.py:771
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s fra %s har problemer med avhengigheter"
-#: ../yum/depsolve.py:778
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Suksess - alle avhengigheter er tilfredstilt"
-#: ../yum/depsolve.py:792
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Sjekker avhengigheter for %s"
-#: ../yum/depsolve.py:875
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "leter etter %s som kreves av %s"
-#: ../yum/depsolve.py:1017
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Kjører compare_providers() for %s"
-#: ../yum/depsolve.py:1051 ../yum/depsolve.py:1057
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "bedre arch i po %s"
-#: ../yum/depsolve.py:1132
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s faser ut %s"
-#: ../yum/depsolve.py:1144
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1639,103 +1866,103 @@ msgstr ""
"archdist sammenlignet %s med %s på %s\n"
" Vinner: %s"
-#: ../yum/depsolve.py:1151
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "felles kilderpm %s og %s"
-#: ../yum/depsolve.py:1157
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "felles prefiks fra %s mellom %s og %s"
-#: ../yum/depsolve.py:1165
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Beste rekkefølge: %s"
-#: ../yum/__init__.py:156
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() vil forsvinne i en kommende utgave av Yum.\n"
-#: ../yum/__init__.py:377
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Pakkelager %r mangler navn i konfigurasjonsfilen(e), bruker id"
-#: ../yum/__init__.py:415
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "tillegg til yum er allerede initiert"
-#: ../yum/__init__.py:422
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() vil forsvinne i en kommende utgave av Yum.\n"
-#: ../yum/__init__.py:433
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Leser inn lokal RPM-database"
-#: ../yum/__init__.py:454
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() vil forsvinne i en kommende utgave av Yum\n"
-#: ../yum/__init__.py:474
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() vil forsvinne i en kommende utgave av Yum\n"
-#: ../yum/__init__.py:504
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Lager sekker med pakker"
-#: ../yum/__init__.py:549
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "objekt for pakkelager %s mangler metoden _resetSack\n"
-#: ../yum/__init__.py:550
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "derfor kan ikke denne pakkeoversikten nullstilles\n"
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() vil forsvinne i en kommende utgave av Yum.\n"
-#: ../yum/__init__.py:567
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Bygger opp oppdateringsobjekt"
-#: ../yum/__init__.py:602
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() vil forsvinne i en kommende utgave av Yum.\n"
-#: ../yum/__init__.py:627
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Henter metadata for grupper"
-#: ../yum/__init__.py:653
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Legger til gruppefil fra pakkeoversikt: %s"
-#: ../yum/__init__.py:662
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Kunne ikke legge til gruppefil for pakkeoversikt: %s - %s"
-#: ../yum/__init__.py:668
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Ingen grupper tilgjengelig fra noen lagre"
-#: ../yum/__init__.py:718
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Henter mer informasjon om fil-lister"
-#: ../yum/__init__.py:732
+#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr "Programmet %s%s%s er funnet i yum-utils pakken."
-#: ../yum/__init__.py:740
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1743,17 +1970,17 @@ msgstr ""
"Det er uferdige transaksjoner igjen. Du vil kanskje vurdere å kjøre yum-"
"complete-transaction først for å gjøre dem ferdig."
-#: ../yum/__init__.py:808
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Runde %i for å hoppe over feil avhengighet"
-#: ../yum/__init__.py:860
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "På grunn feil i avhengigheter ble det gjennomført %i runder "
-#: ../yum/__init__.py:861
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1761,77 +1988,78 @@ msgstr ""
"\n"
"Pakker som ble oversett på grunn av problemer med avhengigheter:"
-#: ../yum/__init__.py:865
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s fra %s"
-#: ../yum/__init__.py:1003
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Advarsel: et scriptlet eller andre ikkekritiske feil oppstod under "
"transaksjonen."
-#: ../yum/__init__.py:1018
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Kunne ikke fjerne transaksjonsfil %s"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1047
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s var ment til å bli installert men er ikke!"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1086
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s var ment til å bli fjernet men er ikke!"
-#: ../yum/__init__.py:1132
-#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr "ekskluderer på grunn av kostnad: %s fra %s"
-
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1203
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Kunne ikke sjekke om PID %s er aktiv"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1207
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Det fins allerede en låsfil %s: en annen Yum kjører med PID %s."
-#: ../yum/__init__.py:1284
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, fuzzy, python-format
+msgid "Could not create lock at %s: %s "
+msgstr "Kunne ikke finne oppdatering som passet for %s"
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Det er forskjell mellom nedlastet og forventet størrelse"
-#: ../yum/__init__.py:1299
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Kunne ikke beregne sjekksum"
-#: ../yum/__init__.py:1302
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Pakken har ikke korrekt sjekksum"
-#: ../yum/__init__.py:1344
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "sjekksummen til pakken er feil, men mellomlagring er satt på for %s"
-#: ../yum/__init__.py:1347 ../yum/__init__.py:1376
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "bruker lokal kopi av %s"
-#: ../yum/__init__.py:1388
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1842,11 +2070,11 @@ msgstr ""
" * ledig %s \n"
" * trenger %s"
-#: ../yum/__init__.py:1437
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Filhode er ikke fullstendig."
-#: ../yum/__init__.py:1474
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1854,62 +2082,62 @@ msgstr ""
"Filhode er ikke tilgjengelig lokalt og mellomlager-modus er aktivert Kan "
"ikke hente ned %s"
-#: ../yum/__init__.py:1529
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Offentlig nøkkel for %s er ikke lagt inn"
-#: ../yum/__init__.py:1533
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problem ved åpning av pakke %s"
-#: ../yum/__init__.py:1541
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Offentlig nøkkel %s er ikke til å stole på"
-#: ../yum/__init__.py:1545
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Pakken %s er ikke signert"
-#: ../yum/__init__.py:1583
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Kan ikke fjerne %s"
-#: ../yum/__init__.py:1587
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s fjernet"
-#: ../yum/__init__.py:1623
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Kan ikke fjerne %s fra fil %s"
-#: ../yum/__init__.py:1627
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s fil %s er fjernet"
-#: ../yum/__init__.py:1629
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s filer fjernet"
-#: ../yum/__init__.py:1698
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Mer enn ett identisk passende treff i sekken %s"
-#: ../yum/__init__.py:1704
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ingenting passer %s.%s %s:%s-%s fra oppdatering"
-#: ../yum/__init__.py:1937
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1917,177 +2145,180 @@ msgstr ""
"searchPackages() vil forsvinne i en kommende utgave av Yum.\n"
"Bruk heller searchGenerator()\n"
-#: ../yum/__init__.py:1979
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Søker etter %d pakker"
-#: ../yum/__init__.py:1983
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "søker etter pakke %s"
-#: ../yum/__init__.py:1995
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "søker i filoversikt"
-#: ../yum/__init__.py:2002
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "søker i oppføringer av tilbud"
-#: ../yum/__init__.py:2035
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Tilbyder-treff: %s"
-#: ../yum/__init__.py:2084
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Ingen gruppedata tilgjengelig for konfigurerte pakkelager"
-#: ../yum/__init__.py:2115 ../yum/__init__.py:2134 ../yum/__init__.py:2165
-#: ../yum/__init__.py:2171 ../yum/__init__.py:2250 ../yum/__init__.py:2254
-#: ../yum/__init__.py:2551
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Det eksisterer ingen gruppe med navn %s "
-#: ../yum/__init__.py:2146 ../yum/__init__.py:2267
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "pakke %s var ikke med i gruppe %s"
-#: ../yum/__init__.py:2193
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Legger til pakke %s fra gruppe %s"
-#: ../yum/__init__.py:2197
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Ingen pakke med navn %s er tilgjendelig for installering"
-#: ../yum/__init__.py:2294
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Pakke tuppel %s ble ikke funnet i sekken med pakker"
-#: ../yum/__init__.py:2308
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() vil bli borte, bruk self.rpmdb.searchPkgTuple"
-"().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Pakke tuppel %s ble ikke funnet i sekken med pakker"
-#: ../yum/__init__.py:2364 ../yum/__init__.py:2409
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Ugyldig versjonsflagg"
-#: ../yum/__init__.py:2379 ../yum/__init__.py:2384
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Ingen pakke for %s er funnet"
-#: ../yum/__init__.py:2584
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Pakkeobjekt var ikke en pakkeobjektinstans"
-#: ../yum/__init__.py:2588
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Ingenting oppgitt for installasjon"
-#: ../yum/__init__.py:2604 ../yum/__init__.py:3333
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Sjekker for virtuelle tilbydere eller tilbydere av filer for %s"
-#: ../yum/__init__.py:2610 ../yum/__init__.py:2900 ../yum/__init__.py:3063
-#: ../yum/__init__.py:3339
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Ingen treff for argument: %s"
-#: ../yum/__init__.py:2684
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Pakke %s er installert og ikke tilgjengelig"
-#: ../yum/__init__.py:2687
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Ingen pakke(r) er tilgjengelig for installering"
-#: ../yum/__init__.py:2699
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Pakke: %s - allerede i transaksjonensettet"
-#: ../yum/__init__.py:2725
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "Pakke %s er foreldet av %s som allerede er installert"
-#: ../yum/__init__.py:2728
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "Pakke %s er foreldet av %s, prøver å installere %s isteden."
-#: ../yum/__init__.py:2736
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Pakke %s er allerede installert i siste versjon"
-#: ../yum/__init__.py:2750
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "Pakke med treff på %s er allerede lagt inn. Ser etter oppdatering"
#. update everything (the easy case)
-#: ../yum/__init__.py:2836
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Oppdaterer alt"
-#: ../yum/__init__.py:2854 ../yum/__init__.py:2965 ../yum/__init__.py:2986
-#: ../yum/__init__.py:3012
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Vil ikke oppdatere pakke som allerede er foreldet: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2889 ../yum/__init__.py:3060
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2956
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Pakka er allerede foreldet: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2989 ../yum/__init__.py:3015
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Vil ikke oppdatere pakke som allerede er foreldet: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Oppdatere ikke pakken som allerede er oppdatert: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3076
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Kunne ikke finne noen passende pakke for fjerning"
-#: ../yum/__init__.py:3110 ../yum/__init__.py:3201 ../yum/__init__.py:3288
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Kunne ikke åpne fil: %s. Hopper over."
-#: ../yum/__init__.py:3113 ../yum/__init__.py:3204 ../yum/__init__.py:3291
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Undersøker: %s: %s"
-#: ../yum/__init__.py:3121 ../yum/__init__.py:3207 ../yum/__init__.py:3294
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Kan ikke legge til pakke %s til transaksjonen. Det er ikke en kompatibel "
"arkitektur: %s"
-#: ../yum/__init__.py:3129
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2096,93 +2327,98 @@ msgstr ""
"Pakka %s er ikke installert, så den kan ikke oppdateres. Bruk kommandoen yum "
"install for å legge den inn."
-#: ../yum/__init__.py:3164 ../yum/__init__.py:3218 ../yum/__init__.py:3305
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Ekskluderer %s"
-#: ../yum/__init__.py:3169
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Setter av %s for kommende installering"
-#: ../yum/__init__.py:3175
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Setter av %s som en oppdatering av %s"
-#: ../yum/__init__.py:3182
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: vil ikke oppdatere installert pakke."
-#: ../yum/__init__.py:3237
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "Problem ved reinstall: kunne ikke finne passende pakke og fjerne"
-#: ../yum/__init__.py:3249 ../yum/__init__.py:3366
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Pakke %s er tillatt flere installeringer, hopper over."
-#: ../yum/__init__.py:3267
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr "Problem i ominstalleringen: ingen pakke %s funnet for installering."
-#: ../yum/__init__.py:3358
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Ingen pakke(r) er tilgjengelig for nedgradering"
-#: ../yum/__init__.py:3402
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Ingen treff for tilgjengelig pakke: %s"
-#: ../yum/__init__.py:3408
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Bare oppgraderinger tilgjengelig på pakke: %s"
-#: ../yum/__init__.py:3467
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Pakke(r) som skal nedgraderes"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Henter GPG-nøkkel fra %s"
-#: ../yum/__init__.py:3487
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Henting av GPG-nøkkel feilet: "
-#: ../yum/__init__.py:3498
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Analyse av GPG-nøkkel feilet: nøkkelen har ikke verdi %s"
-#: ../yum/__init__.py:3530
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG-nøkkel ved %s (0x%s) er allerede lagt inn"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3535 ../yum/__init__.py:3597
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Legger inn GPG-nøkkel 0x%s \"%s\" fra %s"
-#: ../yum/__init__.py:3552
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Legger ikke inn nøkkel"
-#: ../yum/__init__.py:3558
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Import av nøkkel feilet (kode %d)"
-#: ../yum/__init__.py:3559 ../yum/__init__.py:3618
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Nøkler ble lagt inn med suksess"
-#: ../yum/__init__.py:3564 ../yum/__init__.py:3623
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2194,38 +2430,38 @@ msgstr ""
"Sjekk at korrekt URL (gpgkey opsjonen) er oppgitt for denne\n"
"pakkeoversikten."
-#: ../yum/__init__.py:3573
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Import av nøkler hjalp ikke, feil nøkler?"
-#: ../yum/__init__.py:3592
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG-nøkkel ved %s (0x%s) er allerede importert"
-#: ../yum/__init__.py:3612
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Legger ikke inn nøkkel for arkiv %s"
-#: ../yum/__init__.py:3617
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Import av nøkkel feilet"
-#: ../yum/__init__.py:3738
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Kunne ikke finne passende filspeil"
-#: ../yum/__init__.py:3740
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Det oppstod feil ved nedlastning av pakker."
-#: ../yum/__init__.py:3781
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Vennligst send en feilrapport til %s"
-#: ../yum/__init__.py:3805
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Feil ved testtransaksjon: "
@@ -2283,7 +2519,7 @@ msgstr "Konfigurasjonsfila %s ble ikke funnet"
msgid "Unable to find configuration file for plugin %s"
msgstr "Kunne ikke finne konfigurasjon for tillegg %s"
-#: ../yum/plugins.py:497
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "registering av kommandoer er ikke støttet"
@@ -2320,12 +2556,19 @@ msgstr "Filhode til %s er ødelagt"
msgid "Error opening rpm %s - error %s"
msgstr "Kunne ikke åpen rpm pakke %s - feilen er %s"
+#~ msgid "excluding for cost: %s from %s"
+#~ msgstr "ekskluderer på grunn av kostnad: %s fra %s"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() vil bli borte, bruk self.rpmdb.searchPkgTuple"
+#~ "().\n"
+
#~ msgid "Parsing package install arguments"
#~ msgstr "Analyserer argumentene for pakkeinstallasjon"
-#~ msgid "Could not find update match for %s"
-#~ msgstr "Kunne ikke finne oppdatering som passet for %s"
-
#~ msgid "Matching packages for package list to user args"
#~ msgstr "Tilpasser pakkeliste etter brukers ønske"
@@ -2376,9 +2619,6 @@ msgstr "Kunne ikke åpen rpm pakke %s - feilen er %s"
#~ msgid "TSINFO: Updating %s to resolve conflict."
#~ msgstr "TSINFO: Oppdaterer %s for å løse opp i konflikt."
-#~ msgid "%s conflicts: %s"
-#~ msgstr "%s er i konflikt med: %s"
-
#~ msgid "%s conflicts with %s"
#~ msgstr "%s er i konflikt med %s"
diff --git a/po/pl.po b/po/pl.po
index 781f145..087f8fb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-03 10:13+0000\n"
-"PO-Revision-Date: 2009-10-03 16:51+0200\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
+"PO-Revision-Date: 2009-12-19 09:43+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <fedora-trans-pl@redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -30,16 +30,16 @@ msgstr "Instalowanie"
msgid "Obsoleted"
msgstr "Przestarzałe"
-#: ../callback.py:54 ../output.py:1063 ../output.py:1401
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Zaktualizowano"
-#: ../callback.py:55 ../output.py:1397
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Usunięto"
#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
-#: ../output.py:1393
+#: ../output.py:1395
msgid "Installed"
msgstr "Zainstalowano"
@@ -69,60 +69,60 @@ msgstr "Usuwanie"
msgid "Cleanup"
msgstr "Czyszczenie"
-#: ../cli.py:108
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Polecenie \"%s\" zostało już określone"
-#: ../cli.py:120
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Ustawianie repozytoriów"
-#: ../cli.py:131
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Odczytywanie metadanych repozytoriów z lokalnych plików"
-#: ../cli.py:194 ../utils.py:102
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Błąd konfiguracji: %s"
-#: ../cli.py:197 ../cli.py:1253 ../utils.py:105
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Błąd opcji: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Zainstalowane: %s-%s o %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Zbudowane : %s o %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Wysłane: %s o %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Należy podać polecenie"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Wymagane miejsce na dysku:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Wymagane jest co najmniej %d MB w systemie plików %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -130,65 +130,65 @@ msgstr ""
"Podsumowanie błędów\n"
"-------------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
"Próbowano wykonać transakcję, ale nie ma nic do zrobienia. Kończenie pracy."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Kończenie pracy na polecenie użytkownika"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Pobieranie pakietów:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Błąd podczas pobierania pakietów:\n"
-#: ../cli.py:420 ../yum/__init__.py:3996
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Wykonywanie rpm_check_debug"
-#: ../cli.py:429 ../yum/__init__.py:4005
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "BŁĄD należy zaktualizować pakiet RPM, aby obsłużyć:"
-#: ../cli.py:431 ../yum/__init__.py:4008
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "BŁĄD rpm_check_debug i rozwiązywania zależności:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "Pakiet RPM musi zostać zaktualizowany"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Proszę zgłosić ten błąd na %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Wykonywanie testu transakcji"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Ukończono test transakcji"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Błąd podczas sprawdzania transakcji:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Test transakcji został ukończony powodzeniem"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Wykonywanie transakcji"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -197,79 +197,79 @@ msgstr ""
"uruchomienia.\n"
"Należy użyć \"-y\", aby wymusić."
-#: ../cli.py:540 ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Czy chodziło o: "
-#: ../cli.py:557 ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Pakiety %s%s%s są dostępne, ale nie są zainstalowane."
-#: ../cli.py:571 ../cli.py:602 ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Nie ma pakietu %s%s%s."
-#: ../cli.py:607 ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Pakiety do zainstalowania"
-#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Nie ma niczego do zrobienia"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pakietów oznaczonych do aktualizacji"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Brak pakietów oznaczonych do aktualizacji"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pakietów oznaczonych do usunięcia"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Brak pakietów oznaczonych do usunięcia"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Pakiety do instalacji starszej wersji"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (z %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Zainstalowany pakiet %s%s%s%s jest niedostępny."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Pakiety do ponownego zainstalowania"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Nie podano pakietów"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Ostrzeżenie: nie odnaleziono wyników dla: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Brak wyników"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -278,108 +278,108 @@ msgstr ""
"Ostrzeżenie: wersje 3.0.x programu yum błędnie dopasowują nazwy plików.\n"
" Można użyć \"%s*/%s%s\" i/lub \"%s*bin/%s%s\", aby uzyskać to zachowanie"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Nie odnaleziono pakietów dla %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Czyszczenie wszystkiego"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Czyszczenie nagłówków"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Czyszczenie pakietów"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Czytanie metadanych XML"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Czyszczenie pamięci podręcznej bazy danych"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Czytanie metadanych wygasłej pamięci podręcznej"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Czyszczenie wtyczek"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Zainstalowane grupy:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Dostępne grupy:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Ukończono"
-#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2622
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Ostrzeżenie: grupa %s nie istnieje."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Brak pakietów dostępnych do instalacji lub aktualizacji w żadnej z żądanych "
"grup"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pakietów do instalacji"
-#: ../cli.py:1012 ../yum/__init__.py:2634
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Grupa o nazwie %s nie istnieje"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Brak pakietów do usunięcia z grup"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pakietów do usunięcia"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Pakiet %s jest już zainstalowany, pomijanie"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Odrzucanie pakietu %s.%s, którego nie można porównać"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Inne %s nie są zainstalowane, dodawanie do listy potencjalnie instalowanych"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Opcje wtyczki"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Błąd wiersza poleceń: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -390,103 +390,103 @@ msgstr ""
"\n"
"%s: opcja %s wymaga parametru"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color przyjmuje jedną z: auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "wyświetla ten komunikat pomocy i kończy pracę"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "toleruje błędy"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "uruchamia wyłącznie z pamięci podręcznej i nie aktualizuje jej"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "położenie pliku konfiguracji"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "maksymalny czas oczekiwania na polecenie"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "poziom wyjścia debugowania"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "wyświetla duplikaty w repozytoriach w poleceniach list/search"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "poziom wyjścia błędów"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "mało komunikatów"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "dużo komunikatów"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "odpowiada tak na wszystkie pytania"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "wyświetla wersję programu yum i kończy pracę"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "ustawia roota instalacji"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "włącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "wyłącza jedno lub więcej repozytoriów (wieloznaczniki są dozwolone)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "wyklucza pakiety po nazwie lub wyrażeniu regularnym"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "wyłącza wykluczanie z głównego, dla repozytorium lub wszystkiego"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "włącza przetwarzanie przestarzałych pakietów podczas aktualizacji"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "wyłącza wtyczki programu yum"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "wyłącza sprawdzanie podpisu GPG"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "wyłącza wtyczki po nazwie"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "włącza wtyczki po nazwie"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "pomija pakiety mające problemy z rozwiązaniem zależności"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "kontroluje użycie kolorów"
@@ -876,193 +876,201 @@ msgstr "przerwane przez użytkownika"
msgid "Total"
msgstr "Razem"
-#: ../output.py:1201
+#: ../output.py:1203
msgid "<unset>"
msgstr "<nie ustawione>"
-#: ../output.py:1202
+#: ../output.py:1204
msgid "System"
msgstr "System"
-#: ../output.py:1238
+#: ../output.py:1240
msgid "Bad transaction IDs, or package(s), given"
msgstr "Podano błędne identyfikatory transakcji lub pakietów"
-#: ../output.py:1282 ../yumcommands.py:1149 ../yum/__init__.py:1060
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
msgid "Warning: RPMDB has been altered since the last yum transaction."
msgstr ""
"Ostrzeżenie: baza danych RPM została zmieniona od ostatniej transakcji "
"programu yum."
-#: ../output.py:1287
+#: ../output.py:1289
msgid "No transaction ID given"
msgstr "Nie podano identyfikatora transakcji"
-#: ../output.py:1295
+#: ../output.py:1297
msgid "Bad transaction ID given"
msgstr "Podano błędny identyfikator transakcji"
-#: ../output.py:1300
+#: ../output.py:1302
msgid "Not found given transaction ID"
msgstr "Nie odnaleziono podanego identyfikatora transakcji"
-#: ../output.py:1308
+#: ../output.py:1310
msgid "Found more than one transaction ID!"
msgstr "Odnaleziono więcej niż jeden identyfikator transakcji."
-#: ../output.py:1329
+#: ../output.py:1331
msgid "No transaction ID, or package, given"
msgstr "Podano błędny identyfikator transakcji lub pakietu"
-#: ../output.py:1355
+#: ../output.py:1357
msgid "Transaction ID :"
msgstr "Identyfikator transakcji :"
-#: ../output.py:1357
+#: ../output.py:1359
msgid "Begin time :"
msgstr "Czas rozpoczęcia :"
-#: ../output.py:1360 ../output.py:1362
+#: ../output.py:1362 ../output.py:1364
msgid "Begin rpmdb :"
msgstr "Rozpoczęcie bazy danych RPM:"
-#: ../output.py:1376
+#: ../output.py:1378
#, python-format
msgid "(%s seconds)"
msgstr "%s sekundy)"
-#: ../output.py:1377
+#: ../output.py:1379
msgid "End time :"
msgstr "Czas ukończenia :"
-#: ../output.py:1380 ../output.py:1382
+#: ../output.py:1382 ../output.py:1384
msgid "End rpmdb :"
msgstr "Ukończenie bazy danych RPM :"
-#: ../output.py:1383
+#: ../output.py:1385
msgid "User :"
msgstr "Użytkownik :"
-#: ../output.py:1385 ../output.py:1387 ../output.py:1389
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
msgid "Return-Code :"
msgstr "Kod zwrotny :"
-#: ../output.py:1385
+#: ../output.py:1387
msgid "Aborted"
msgstr "Przerwano"
-#: ../output.py:1387
+#: ../output.py:1389
msgid "Failure:"
msgstr "Niepowodzenie:"
-#: ../output.py:1389
+#: ../output.py:1391
msgid "Success"
msgstr "Powodzenie"
-#: ../output.py:1390
-msgid "Transaction performed with :"
+#: ../output.py:1392
+msgid "Transaction performed with:"
msgstr "Wykonano transakcję za pomocą:"
-#: ../output.py:1403
+#: ../output.py:1405
msgid "Downgraded"
msgstr "Zainstalowano starszą wersję"
#. multiple versions installed, both older and newer
-#: ../output.py:1405
+#: ../output.py:1407
msgid "Weird"
msgstr "Dziwne"
-#: ../output.py:1407
+#: ../output.py:1409
msgid "Packages Altered:"
msgstr "Zmienione pakiety:"
-#: ../output.py:1475
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr "Wyjście skryptu:"
+
+#: ../output.py:1418
+msgid "Errors:"
+msgstr "Błędy:"
+
+#: ../output.py:1489
msgid "Last day"
msgstr "Ostatni dzień"
-#: ../output.py:1476
+#: ../output.py:1490
msgid "Last week"
msgstr "Ostatni tydzień"
-#: ../output.py:1477
+#: ../output.py:1491
msgid "Last 2 weeks"
msgstr "Ostatnie dwa tygodnie"
#. US default :p
-#: ../output.py:1478
+#: ../output.py:1492
msgid "Last 3 months"
msgstr "Ostatnie trzy miesiące"
-#: ../output.py:1479
+#: ../output.py:1493
msgid "Last 6 months"
msgstr "Ostatnie pół roku"
-#: ../output.py:1480
+#: ../output.py:1494
msgid "Last year"
msgstr "Ostatni rok"
-#: ../output.py:1481
+#: ../output.py:1495
msgid "Over a year ago"
msgstr "Ponad rok temu"
-#: ../output.py:1510
+#: ../output.py:1524
msgid "installed"
msgstr "zainstalowany"
-#: ../output.py:1511
+#: ../output.py:1525
msgid "updated"
msgstr "zaktualizowany"
-#: ../output.py:1512
+#: ../output.py:1526
msgid "obsoleted"
msgstr "zastąpiony"
-#: ../output.py:1513
+#: ../output.py:1527
msgid "erased"
msgstr "usunięty"
-#: ../output.py:1517
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Pakiet %s.%s %s:%s-%s zostanie %s"
-#: ../output.py:1524
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Wykonywanie sprawdzania transakcji"
-#: ../output.py:1529
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Ponowne uruchamianie rozwiązywania zależności z nowymi zmianami."
-#: ../output.py:1534
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Ukończono rozwiązywanie zależności"
-#: ../output.py:1539 ../output.py:1544
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Przetwarzanie zależności: %s dla pakietu: %s"
-#: ../output.py:1548
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nierozwiązana zależność: %s"
-#: ../output.py:1554 ../output.py:1559
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Przetwarzanie konfliktów: %s jest w konflikcie z %s"
-#: ../output.py:1563
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Układanie zestawu transakcji z wybranymi pakietami. Proszę czekać."
-#: ../output.py:1567
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Pobieranie nagłówka dla %s do umieszczenia w zestawie transakcji."
-#: ../utils.py:132 ../yummain.py:42
+#: ../utils.py:137 ../yummain.py:42
msgid ""
"\n"
"\n"
@@ -1072,7 +1080,7 @@ msgstr ""
"\n"
"Kończenie pracy na polecenie użytkownika"
-#: ../utils.py:138 ../yummain.py:48
+#: ../utils.py:143 ../yummain.py:48
msgid ""
"\n"
"\n"
@@ -1082,7 +1090,7 @@ msgstr ""
"\n"
"Kończenie pracy z powodu przerwanego potoku"
-#: ../utils.py:140 ../yummain.py:50
+#: ../utils.py:145 ../yummain.py:50
#, python-format
msgid ""
"\n"
@@ -1093,7 +1101,7 @@ msgstr ""
"\n"
"%s"
-#: ../utils.py:179 ../yummain.py:273
+#: ../utils.py:184 ../yummain.py:273
msgid "Complete!"
msgstr "Ukończono."
@@ -1634,149 +1642,149 @@ msgstr ""
"\n"
"Kończenie pracy na polecenie użytkownika."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() zostanie usunięte w przyszłych wersjach programu yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Ustawianie zestawów transakcji przed włączeniem klasy konfiguracji"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Nieprawidłowa flaga zestawu transakcji tsflag w pliku konfiguracji: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Wyszukiwanie zestawu pakietów dla zależności: %s"
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Potencjalny wynik dla %s z %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "%s pasuje jako wymaganie dla %s"
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Element: %s"
-#: ../yum/depsolve.py:239 ../yum/depsolve.py:749
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s przekonwertowano do zainstalowania"
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Dodawanie pakietu %s w trybie %s"
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Usuwanie pakietu %s"
-#: ../yum/depsolve.py:278
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s wymaga: %s"
-#: ../yum/depsolve.py:336
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Wymagana zależność została już odnaleziona, oszukiwanie"
-#: ../yum/depsolve.py:346
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Wymagana zależność nie jest nazwą pakietu. Wyszukiwanie: %s"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Potencjalny dostawca: %s"
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Tryb to %s dla dostawcy %s: %s"
-#: ../yum/depsolve.py:380
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Tryb dla pakietu dostarczającego %s: %s"
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: pakiet %s wymagający %s został oznaczony jako do usunięcia"
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
"TSINFO: zastępowanie przestarzałego pakietu %s pakietem %s, aby rozwiązać "
"zależność."
-#: ../yum/depsolve.py:400
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: aktualizowanie %s, aby rozwiązać zależność."
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Nie można odnaleźć ścieżki aktualizacji dla zależności dla: %s"
-#: ../yum/depsolve.py:418
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Nie można rozwiązać wymagania %s dla %s"
-#: ../yum/depsolve.py:441
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Szybko dopasowano %s jako wymaganie %s"
#. is it already installed?
-#: ../yum/depsolve.py:483
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
"%s jest w dostarczających pakietach, ale jest już zainstalowany, usuwanie."
-#: ../yum/depsolve.py:499
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
"Pakiet %s potencjalnie rozwiązujący ma nowszą wersję w zestawie transakcji."
-#: ../yum/depsolve.py:510
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Pakiet %s potencjalnie rozwiązujący ma zainstalowaną nowszą wersję."
-#: ../yum/depsolve.py:518 ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Brakująca zależność: %s jest wymagane przez pakiet %s"
-#: ../yum/depsolve.py:531
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s jest już w zestawie transakcji, pomijanie"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: oznaczanie %s jako aktualizacji dla %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: oznaczanie %s jako do zainstalowania dla %s"
@@ -1966,74 +1974,74 @@ msgstr ""
msgid " %s from %s"
msgstr " %s z %s"
-#: ../yum/__init__.py:1076
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Ostrzeżenie: podczas transakcji wystąpił skrypt lub inne nie krytyczne błędy."
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Usunięcie pliku transakcji %s nie powiodło się"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1123
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s miało zostać zainstalowane, ale nie zostało."
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1162
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s miało zostać usunięte, ale nie zostało."
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Nie można sprawdzić, czy PID %s jest aktywny"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1286
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Istnieje blokada %s: inna kopia jest uruchomiona jako PID %s."
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1321
+#: ../yum/__init__.py:1328
#, python-format
msgid "Could not create lock at %s: %s "
msgstr "Nie można utworzyć blokady na %s: %s "
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Pakiet nie zgadza się z zamierzonym pobieraniem"
-#: ../yum/__init__.py:1381
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Nie można wykonać sprawdzenia sum kontrolnych"
-#: ../yum/__init__.py:1384
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Sumy kontrolne pakietu nie zgadzają się"
-#: ../yum/__init__.py:1426
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"sprawdzenie sum kontrolnych pakietu nie powiodło się, ale zapisywanie w "
"pamięci podręcznej dla %s jest włączone"
-#: ../yum/__init__.py:1429 ../yum/__init__.py:1458
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "używanie lokalnej kopii %s"
-#: ../yum/__init__.py:1470
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -2044,11 +2052,11 @@ msgstr ""
" * wolne %s\n"
" * wymagane %s"
-#: ../yum/__init__.py:1519
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Nagłówek nie jest pełny."
-#: ../yum/__init__.py:1556
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -2056,62 +2064,62 @@ msgstr ""
"Nagłówek nie jest w lokalnej pamięci podręcznej, a tryb używania tylko "
"pamięci podręcznej jest włączony. Nie można pobrać %s"
-#: ../yum/__init__.py:1611
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Klucz publiczny dla %s nie jest zainstalowany"
-#: ../yum/__init__.py:1615
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Wystąpił problem podczas otwierania pakietu %s"
-#: ../yum/__init__.py:1623
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Klucz publiczny dla %s nie jest zaufany"
-#: ../yum/__init__.py:1627
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Pakiet %s nie jest podpisany"
-#: ../yum/__init__.py:1665
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Nie można usunąć %s"
-#: ../yum/__init__.py:1669
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "Usunięto %s"
-#: ../yum/__init__.py:1705
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Nie można usunąć %s pliku %s"
-#: ../yum/__init__.py:1709
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "Usunięto %s plik %s"
-#: ../yum/__init__.py:1711
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "Usunięto %d %s plików"
-#: ../yum/__init__.py:1780
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Więcej niż jeden identyczny wynik znajduje się w zestawie dla %s"
-#: ../yum/__init__.py:1786
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Nic nie pasuje do %s.%s %s:%s-%s z aktualizacji"
-#: ../yum/__init__.py:2019
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -2119,180 +2127,180 @@ msgstr ""
"searchPackages() zostanie usunięte w przyszłych wersjach programu "
"yum. Zamiast tego należy użyć searchGenerator(). \n"
-#: ../yum/__init__.py:2058
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Wyszukiwanie %d pakietów"
-#: ../yum/__init__.py:2062
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "wyszukiwanie pakietu %s"
-#: ../yum/__init__.py:2074
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "wyszukiwanie we wpisach plików"
-#: ../yum/__init__.py:2081
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "wyszukiwanie we wpisach dostarczania"
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Wyniki dostarczania: %s"
-#: ../yum/__init__.py:2163
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Brak dostępnych danych grup dla skonfigurowanych repozytoriów"
-#: ../yum/__init__.py:2194 ../yum/__init__.py:2213 ../yum/__init__.py:2244
-#: ../yum/__init__.py:2250 ../yum/__init__.py:2329 ../yum/__init__.py:2333
-#: ../yum/__init__.py:2648
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Grupa o nazwie %s nie istnieje"
-#: ../yum/__init__.py:2225 ../yum/__init__.py:2346
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "pakiet %s nie został oznaczony w grupie %s"
-#: ../yum/__init__.py:2272
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Dodawanie pakietu %s z grupy %s"
-#: ../yum/__init__.py:2276
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Brak dostępnego pakietu o nazwie %s do zainstalowania"
-#: ../yum/__init__.py:2373
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Nie można odnaleźć krotki pakietu %s w zestawie pakietów"
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:2399
#, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr "Nie można odnaleźć krotki pakietu %s w bazie danych RPM"
-#: ../yum/__init__.py:2448 ../yum/__init__.py:2498
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Nieprawidłowa flaga wersji"
-#: ../yum/__init__.py:2468 ../yum/__init__.py:2473
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Nie odnaleziono pakietu %s"
-#: ../yum/__init__.py:2689
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Obiekt pakietu nie był instancją obiektu pakietu"
-#: ../yum/__init__.py:2693
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Nie podano nic do zainstalowania"
-#: ../yum/__init__.py:2709 ../yum/__init__.py:3473
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Sprawdzanie wirtualnych zależności lub plików dla %s"
-#: ../yum/__init__.py:2715 ../yum/__init__.py:3022 ../yum/__init__.py:3189
-#: ../yum/__init__.py:3479
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Brak wyników dla parametru: %s"
-#: ../yum/__init__.py:2791
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Pakiet %s jest zainstalowany, ale nie jest dostępny"
-#: ../yum/__init__.py:2794
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Brak pakietów dostępnych do instalacji"
-#: ../yum/__init__.py:2806
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Pakiet: %s - jest już w zestawie transakcji"
-#: ../yum/__init__.py:2832
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "Pakiet %s został zastąpiony przez %s, który jest już zainstalowany"
-#: ../yum/__init__.py:2835
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr ""
"Pakiet %s został zastąpiony przez %s, próbowanie instalacji %s zamiast niego"
-#: ../yum/__init__.py:2843
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Pakiet %s jest już zainstalowany w najnowszej wersji"
-#: ../yum/__init__.py:2857
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"Pakiet pasujący do %s jest już zainstalowany. Sprawdzanie aktualizacji."
#. update everything (the easy case)
-#: ../yum/__init__.py:2951
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Aktualizowanie wszystkiego"
-#: ../yum/__init__.py:2972 ../yum/__init__.py:3087 ../yum/__init__.py:3116
-#: ../yum/__init__.py:3143
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3007 ../yum/__init__.py:3186
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3078
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Pakiet został już zastąpiony: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3111
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Przestarzały pakiet nie zostanie zaktualizowany: %s"
-#: ../yum/__init__.py:3120 ../yum/__init__.py:3147
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Już zaktualizowany pakiet nie zostanie zaktualizowany: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3202
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Brak pasujących pakietów do usunięcia"
-#: ../yum/__init__.py:3235 ../yum/__init__.py:3339 ../yum/__init__.py:3428
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Nie można otworzyć pliku: %s. Pomijanie."
-#: ../yum/__init__.py:3238 ../yum/__init__.py:3342 ../yum/__init__.py:3431
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Sprawdzanie %s: %s"
-#: ../yum/__init__.py:3246 ../yum/__init__.py:3345 ../yum/__init__.py:3434
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr "Nie można dodać pakietu %s do transakcji. Niezgodna architektura: %s"
-#: ../yum/__init__.py:3254
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2301,103 +2309,103 @@ msgstr ""
"Pakiet %s nie jest zainstalowany, nie można go zaktualizować. Należy wykonać "
"polecenie yum install, aby go zainstalować."
-#: ../yum/__init__.py:3289 ../yum/__init__.py:3356 ../yum/__init__.py:3445
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Wykluczanie %s"
-#: ../yum/__init__.py:3294
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Oznaczanie %s do zainstalowania"
-#: ../yum/__init__.py:3300
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Oznaczanie %s jako aktualizacji %s"
-#: ../yum/__init__.py:3307
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: nie aktualizuj zainstalowanego pakietu."
-#: ../yum/__init__.py:3375
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Podczas ponownego instalowania wystąpił problem: brak pasujących pakietów do "
"usunięcia"
-#: ../yum/__init__.py:3388 ../yum/__init__.py:3507
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Pakiet %s może być wielokrotnie instalowany, pomijanie"
-#: ../yum/__init__.py:3409
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
"Podczas ponownego instalowania wystąpił problem: brak pakietu %s pasującego "
"do zainstalowania"
-#: ../yum/__init__.py:3499
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Brak pakietów dostępnych do instalacji starszej wersji"
-#: ../yum/__init__.py:3543
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Brak wyników dla dostępnych pakietów: %s"
-#: ../yum/__init__.py:3549
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Dla pakietu dostępna jest tylko aktualizacja: %s"
-#: ../yum/__init__.py:3617 ../yum/__init__.py:3654
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
#, python-format
msgid "Failed to downgrade: %s"
msgstr "Zainstalowanie starszej wersji nie powiodło się: %s"
-#: ../yum/__init__.py:3686
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Pobieranie klucza GPG z %s"
-#: ../yum/__init__.py:3706
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Pobranie klucza GPG nie powiodło się: "
-#: ../yum/__init__.py:3717
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
"Przetworzenie klucza GPG nie powiodło się: klucz nie posiada wartości %s"
-#: ../yum/__init__.py:3749
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "Klucz GPG %s (0x%s) jest już zainstalowany"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3754 ../yum/__init__.py:3816
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importowanie klucza GPG 0x%s \"%s\" z %s"
-#: ../yum/__init__.py:3771
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Klucz nie zostanie zainstalowany"
-#: ../yum/__init__.py:3777
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Zaimportowanie klucza nie powiodło się (kod %d)"
-#: ../yum/__init__.py:3778 ../yum/__init__.py:3837
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Klucz został pomyślnie zaimportowany"
-#: ../yum/__init__.py:3783 ../yum/__init__.py:3842
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2409,38 +2417,38 @@ msgstr ""
"Proszę sprawdzić, czy dla tego repozytorium skonfigurowane są poprawne "
"adresy URL do kluczy."
-#: ../yum/__init__.py:3792
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Zaimportowanie kluczy nie pomogło, błędne klucze?"
-#: ../yum/__init__.py:3811
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "Klucz GPG %s (0x%s) został już zaimportowany"
-#: ../yum/__init__.py:3831
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Klucz dla repozytorium %s nie zostanie zainstalowany"
-#: ../yum/__init__.py:3836
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Zaimportowanie klucza nie powiodło się"
-#: ../yum/__init__.py:3958
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Nie można odnaleźć odpowiedniego serwera lustrzanego."
-#: ../yum/__init__.py:3960
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Wystąpiły błędy podczas pobierania pakietów."
-#: ../yum/__init__.py:4010
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Proszę zgłosić ten błąd na %s"
-#: ../yum/__init__.py:4034
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Błędy testu transakcji: "
diff --git a/po/pt.po b/po/pt.po
index 1780c50..5aedc26 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 11:29+0100\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2006-05-25 02:05+0100\n"
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
"Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -16,34 +16,36 @@ msgstr ""
"X-POFile-SpellExtra: arch SRPM installroot info md iupi name grubby SO\n"
"X-POFile-SpellExtra: clean gzip retrygrab fich sum\n"
-#: ../callback.py:48 ../output.py:512
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr ""
-#: ../callback.py:49
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr ""
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
#, fuzzy
msgid "Installing"
msgstr "Instalado: "
-#: ../callback.py:52 ../callback.py:58
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr ""
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
#, fuzzy
msgid "Updated"
msgstr "Actualizado: "
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
#, fuzzy
msgid "Erased"
msgstr "Removido: "
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
#, fuzzy
msgid "Installed"
msgstr "Instalado: "
@@ -67,731 +69,1074 @@ msgstr ""
msgid "Erased: %s"
msgstr "Removido: "
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr ""
-#: ../callback.py:219
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr ""
-#: ../cli.py:103
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr ""
-#: ../cli.py:115
+#: ../cli.py:118
#, fuzzy
msgid "Setting up repositories"
msgstr "a obter os grupos do servidor: %s"
-#: ../cli.py:126
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr ""
-#: ../cli.py:183 ../utils.py:72
+#: ../cli.py:192 ../utils.py:107
#, fuzzy, python-format
msgid "Config Error: %s"
msgstr "Erro nas Opções: %s"
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Erro nas Opções: %s"
-#: ../cli.py:229
+#: ../cli.py:223
+#, python-format
+msgid " Installed: %s-%s at %s"
+msgstr ""
+
+#: ../cli.py:225
+#, fuzzy, python-format
+msgid " Built : %s at %s"
+msgstr "Repo : %s"
+
+#: ../cli.py:227
+#, fuzzy, python-format
+msgid " Committed: %s at %s"
+msgstr "Tamanho : %s"
+
+#: ../cli.py:266
#, fuzzy
msgid "You need to give some command"
msgstr "Terá de ser 'root' para executar estes comandos"
-#: ../cli.py:271
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr ""
-#: ../cli.py:273
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr ""
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:278
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
msgstr ""
-#: ../cli.py:317
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
-#: ../cli.py:347
+#: ../cli.py:395
#, fuzzy
msgid "Exiting on user Command"
msgstr "A sair por ordem do utilizador."
-#: ../cli.py:351
+#: ../cli.py:399
#, fuzzy
msgid "Downloading Packages:"
msgstr "A limpar os pacotes"
-#: ../cli.py:356
+#: ../cli.py:404
#, fuzzy
msgid "Error Downloading Packages:\n"
msgstr "Erro: O Pacote %s não Está Assinado"
-#: ../cli.py:370 ../yum/__init__.py:2746
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr ""
-#: ../cli.py:373 ../yum/__init__.py:2749
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
-#: ../cli.py:377 ../yum/__init__.py:2751
-msgid "Please report this error in bugzilla"
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
+#, python-format
+msgid "Please report this error in %s"
msgstr ""
-#: ../cli.py:383
+#: ../cli.py:442
#, fuzzy
msgid "Running Transaction Test"
msgstr "A executar a transacção de teste:"
-#: ../cli.py:399
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr ""
-#: ../cli.py:401
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr ""
-#: ../cli.py:408
+#: ../cli.py:467
#, fuzzy
msgid "Transaction Test Succeeded"
msgstr "A transacção de testes teve sucesso!"
-#: ../cli.py:429
+#: ../cli.py:489
#, fuzzy
msgid "Running Transaction"
msgstr "A executar a transacção de teste:"
-#: ../cli.py:459
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-#: ../cli.py:491
-#, fuzzy
-msgid "Parsing package install arguments"
-msgstr "Erro ao processar os argumentos da linha de comandos: %s"
+#: ../cli.py:538 ../cli.py:572
+msgid " * Maybe you meant: "
+msgstr ""
+
+#: ../cli.py:555 ../cli.py:563
+#, fuzzy, python-format
+msgid "Package(s) %s%s%s available, but not installed."
+msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../cli.py:501
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, fuzzy, python-format
-msgid "No package %s available."
+msgid "No package %s%s%s available."
msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#: ../cli.py:605 ../cli.py:738
#, fuzzy
msgid "Package(s) to install"
msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr ""
-#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
-#: ../yum/__init__.py:2340
-#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr ""
-
-#: ../cli.py:568
-#, fuzzy, python-format
-msgid "Could not find update match for %s"
-msgstr "Não foi detectado um pacote correspondente ao %s"
-
-#: ../cli.py:580
+#: ../cli.py:639
#, fuzzy, python-format
msgid "%d packages marked for Update"
msgstr "Não Há Pacotes Disponíveis para Actualizar"
-#: ../cli.py:583
+#: ../cli.py:642
#, fuzzy
msgid "No Packages marked for Update"
msgstr "Não Há Pacotes Disponíveis para Actualizar"
-#: ../cli.py:599
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr ""
-#: ../cli.py:602
+#: ../cli.py:659
#, fuzzy
msgid "No Packages marked for removal"
msgstr "Não Há Pacotes Disponíveis para Actualizar"
-#: ../cli.py:614
+#: ../cli.py:683
#, fuzzy
-msgid "No Packages Provided"
-msgstr "Não foram encontrados pacotes"
+msgid "Package(s) to downgrade"
+msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../cli.py:654
-msgid "Matching packages for package list to user args"
+#: ../cli.py:707
+#, python-format
+msgid " (from %s)"
msgstr ""
-#: ../cli.py:701
+#: ../cli.py:709
+#, fuzzy, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Não Estão Disponíveis Pacotes para Listar"
+
+#: ../cli.py:716
+#, fuzzy
+msgid "Package(s) to reinstall"
+msgstr "Não Estão Disponíveis Pacotes para Listar"
+
+#: ../cli.py:729
+#, fuzzy
+msgid "No Packages Provided"
+msgstr "Não foram encontrados pacotes"
+
+#: ../cli.py:813
#, fuzzy, python-format
msgid "Warning: No matches found for: %s"
msgstr "Remover: Nada corresponde ao %s"
-#: ../cli.py:704
+#: ../cli.py:816
#, fuzzy
msgid "No Matches found"
msgstr "Não foram encontrados pacotes"
-#: ../cli.py:745
+#: ../cli.py:855
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+
+#: ../cli.py:871
#, fuzzy, python-format
msgid "No Package Found for %s"
msgstr "Não Existe o Pacote %s"
-#: ../cli.py:757
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr ""
-#: ../cli.py:771
+#: ../cli.py:897
#, fuzzy
msgid "Cleaning up Headers"
msgstr "A limpar os cabeçalhos antigos"
-#: ../cli.py:774
+#: ../cli.py:900
#, fuzzy
msgid "Cleaning up Packages"
msgstr "A limpar os pacotes"
-#: ../cli.py:777
+#: ../cli.py:903
#, fuzzy
msgid "Cleaning up xml metadata"
msgstr "A limpar os cabeçalhos antigos"
-#: ../cli.py:780
+#: ../cli.py:906
#, fuzzy
msgid "Cleaning up database cache"
msgstr "A limpar os pacotes"
-#: ../cli.py:783
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr ""
-#: ../cli.py:786
+#: ../cli.py:912
#, fuzzy
msgid "Cleaning up plugins"
msgstr "A limpar os pacotes"
-#: ../cli.py:807
+#: ../cli.py:937
#, fuzzy
msgid "Installed Groups:"
msgstr "Instalado: "
-#: ../cli.py:814
+#: ../cli.py:949
msgid "Available Groups:"
msgstr ""
-#: ../cli.py:820
+#: ../cli.py:959
msgid "Done"
msgstr ""
-#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, fuzzy, python-format
msgid "Warning: Group %s does not exist."
msgstr "O grupo %s não existe"
-#: ../cli.py:853
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
-#: ../cli.py:855
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr ""
-#: ../cli.py:865
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr ""
-#: ../cli.py:871
+#: ../cli.py:1016
#, fuzzy
msgid "No packages to remove from groups"
msgstr "Não foram encontrados pacotes"
-#: ../cli.py:873
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr ""
-#: ../cli.py:915
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr ""
-#: ../cli.py:926
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr ""
#. we've not got any installed that match n or n+a
-#: ../cli.py:952
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
-#: ../cli.py:971
+#: ../cli.py:1117
+msgid "Plugin Options"
+msgstr ""
+
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr ""
-#: ../cli.py:1101
+#: ../cli.py:1138
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+
+#: ../cli.py:1191
+msgid "--color takes one of: auto, always, never"
+msgstr ""
+
+#: ../cli.py:1298
+msgid "show this help message and exit"
+msgstr ""
+
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr ""
-#: ../cli.py:1103
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr ""
-#: ../cli.py:1105
+#: ../cli.py:1306
msgid "config file location"
msgstr ""
-#: ../cli.py:1107
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr ""
-#: ../cli.py:1109
+#: ../cli.py:1310
msgid "debugging output level"
msgstr ""
-#: ../cli.py:1113
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
-#: ../cli.py:1115
+#: ../cli.py:1316
msgid "error output level"
msgstr ""
-#: ../cli.py:1118
+#: ../cli.py:1319
msgid "quiet operation"
msgstr ""
-#: ../cli.py:1122
+#: ../cli.py:1321
+msgid "verbose operation"
+msgstr ""
+
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr ""
-#: ../cli.py:1124
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr ""
-#: ../cli.py:1125
+#: ../cli.py:1326
msgid "set install root"
msgstr ""
-#: ../cli.py:1129
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1133
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1136
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr ""
-#: ../cli.py:1138
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr ""
-#: ../cli.py:1141
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr ""
-#: ../cli.py:1143
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr ""
-#: ../cli.py:1145
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr ""
-#: ../cli.py:1147
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr ""
-#: ../cli.py:1150
+#: ../cli.py:1351
+msgid "enable plugins by name"
+msgstr ""
+
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr ""
-#: ../output.py:229
+#: ../cli.py:1356
+msgid "control whether color is used"
+msgstr ""
+
+#: ../output.py:305
msgid "Jan"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Feb"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Mar"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Apr"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "May"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Jun"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Jul"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Aug"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Sep"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Oct"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Nov"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Dec"
msgstr ""
-#: ../output.py:240
+#: ../output.py:316
msgid "Trying other mirror."
msgstr ""
-#: ../output.py:293
+#: ../output.py:538
#, fuzzy, python-format
-msgid "Name : %s"
+msgid "Name : %s%s%s"
msgstr "Nome : %s"
-#: ../output.py:294
+#: ../output.py:539
#, fuzzy, python-format
msgid "Arch : %s"
msgstr "Arquit.: %s"
-#: ../output.py:296
+#: ../output.py:541
#, fuzzy, python-format
msgid "Epoch : %s"
msgstr "Repo : %s"
-#: ../output.py:297
+#: ../output.py:542
#, fuzzy, python-format
msgid "Version : %s"
msgstr "Versão: %s"
-#: ../output.py:298
+#: ../output.py:543
#, fuzzy, python-format
msgid "Release : %s"
msgstr "Versão: %s"
-#: ../output.py:299
+#: ../output.py:544
#, fuzzy, python-format
msgid "Size : %s"
msgstr "Tamanho : %s"
-#: ../output.py:300
+#: ../output.py:545
#, fuzzy, python-format
msgid "Repo : %s"
msgstr "Repo : %s"
-#: ../output.py:302
+#: ../output.py:547
+#, fuzzy, python-format
+msgid "From repo : %s"
+msgstr "Versão: %s"
+
+#: ../output.py:549
#, fuzzy, python-format
msgid "Committer : %s"
msgstr "Tamanho : %s"
-#: ../output.py:303
+#: ../output.py:550
+#, fuzzy, python-format
+msgid "Committime : %s"
+msgstr "Tamanho : %s"
+
+#: ../output.py:551
+#, fuzzy, python-format
+msgid "Buildtime : %s"
+msgstr "Tamanho : %s"
+
+#: ../output.py:553
+#, fuzzy, python-format
+msgid "Installtime: %s"
+msgstr "[instalar: %s]"
+
+#: ../output.py:554
#, fuzzy
msgid "Summary : "
msgstr "Resumo: %s"
-#: ../output.py:305
+#: ../output.py:556
#, fuzzy, python-format
msgid "URL : %s"
msgstr "Repo : %s"
-#: ../output.py:306
+#: ../output.py:557
#, fuzzy, python-format
msgid "License : %s"
msgstr "Tamanho : %s"
-#: ../output.py:307
+#: ../output.py:558
#, fuzzy
msgid "Description: "
msgstr ""
"Descrição:\n"
" %s"
-#: ../output.py:351
-msgid "Is this ok [y/N]: "
+#: ../output.py:626
+msgid "y"
msgstr ""
-#: ../output.py:357 ../output.py:360
-msgid "y"
+#: ../output.py:626
+msgid "yes"
msgstr ""
-#: ../output.py:357
+#: ../output.py:627
msgid "n"
msgstr ""
-#: ../output.py:357 ../output.py:360
-msgid "yes"
+#: ../output.py:627
+msgid "no"
msgstr ""
-#: ../output.py:357
-msgid "no"
+#: ../output.py:631
+msgid "Is this ok [y/N]: "
msgstr ""
-#: ../output.py:367
+#: ../output.py:722
#, fuzzy, python-format
msgid ""
"\n"
"Group: %s"
msgstr "Grupo : %s"
-#: ../output.py:369
+#: ../output.py:726
+#, fuzzy, python-format
+msgid " Group-Id: %s"
+msgstr "Grupo : %s"
+
+#: ../output.py:731
#, fuzzy, python-format
msgid " Description: %s"
msgstr ""
"Descrição:\n"
" %s"
-#: ../output.py:371
+#: ../output.py:733
#, fuzzy
msgid " Mandatory Packages:"
msgstr "Não Existe o Pacote %s"
-#: ../output.py:376
+#: ../output.py:734
msgid " Default Packages:"
msgstr ""
-#: ../output.py:381
+#: ../output.py:735
#, fuzzy
msgid " Optional Packages:"
msgstr "Não Existe o Pacote %s"
-#: ../output.py:386
+#: ../output.py:736
#, fuzzy
msgid " Conditional Packages:"
msgstr "À Procura de Pacotes Disponíveis:"
-#: ../output.py:394
+#: ../output.py:756
#, fuzzy, python-format
msgid "package: %s"
msgstr "Não Existe o Pacote %s"
-#: ../output.py:396
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr ""
-#: ../output.py:401
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr ""
-#: ../output.py:403
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr ""
-#: ../output.py:461
+#: ../output.py:837
+#, fuzzy, python-format
+msgid "Repo : %s"
+msgstr "Repo : %s"
+
+#: ../output.py:838
msgid "Matched from:"
msgstr ""
-#: ../output.py:487
+#: ../output.py:847
+#, fuzzy
+msgid "Description : "
+msgstr ""
+"Descrição:\n"
+" %s"
+
+#: ../output.py:850
+#, fuzzy, python-format
+msgid "URL : %s"
+msgstr "Repo : %s"
+
+#: ../output.py:853
+#, fuzzy, python-format
+msgid "License : %s"
+msgstr "Tamanho : %s"
+
+#: ../output.py:856
+#, fuzzy, python-format
+msgid "Filename : %s"
+msgstr "Versão: %s"
+
+#: ../output.py:860
+#, fuzzy
+msgid "Other : "
+msgstr "Nome : %s"
+
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr ""
-#: ../output.py:492
+#: ../output.py:898
#, fuzzy, python-format
msgid "Total size: %s"
msgstr "Não é um ficheiro normal: %s"
-#: ../output.py:495
+#: ../output.py:901
#, fuzzy, python-format
msgid "Total download size: %s"
msgstr "Não é um ficheiro normal: %s"
-#: ../output.py:507
+#: ../output.py:942
#, fuzzy
-msgid "Package"
-msgstr "Não Existe o Pacote %s"
-
-#: ../output.py:507
-msgid "Arch"
-msgstr "Arq."
-
-#: ../output.py:507
-msgid "Version"
-msgstr "Versão"
-
-#: ../output.py:507
-msgid "Repository"
-msgstr ""
+msgid "Reinstalling"
+msgstr "Instalado: "
-#: ../output.py:507
-msgid "Size"
+#: ../output.py:943
+msgid "Downgrading"
msgstr ""
-#: ../output.py:514
+#: ../output.py:944
#, fuzzy
msgid "Installing for dependencies"
msgstr "A resolver as dependências"
-#: ../output.py:515
+#: ../output.py:945
#, fuzzy
msgid "Updating for dependencies"
msgstr "A resolver as dependências"
-#: ../output.py:516
+#: ../output.py:946
#, fuzzy
msgid "Removing for dependencies"
msgstr "A resolver as dependências"
-#: ../output.py:528
+#: ../output.py:953 ../output.py:1065
+msgid "Skipped (dependency problems)"
+msgstr ""
+
+#: ../output.py:976
+#, fuzzy
+msgid "Package"
+msgstr "Não Existe o Pacote %s"
+
+#: ../output.py:976
+msgid "Arch"
+msgstr "Arq."
+
+#: ../output.py:977
+msgid "Version"
+msgstr "Versão"
+
+#: ../output.py:977
+msgid "Repository"
+msgstr ""
+
+#: ../output.py:978
+msgid "Size"
+msgstr ""
+
+#: ../output.py:990
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-#: ../output.py:536
+#: ../output.py:999
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
-"=============================================================================\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
+"%s\n"
msgstr ""
-#: ../output.py:554
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr ""
-#: ../output.py:555
+#: ../output.py:1060
#, fuzzy
msgid "Dependency Removed"
msgstr "Dependências resolvidas"
-#: ../output.py:557
+#: ../output.py:1062
#, fuzzy
msgid "Dependency Installed"
msgstr "Dep. Instalada: "
-#: ../output.py:559
+#: ../output.py:1064
#, fuzzy
msgid "Dependency Updated"
msgstr "Dependências resolvidas"
-#: ../output.py:560
+#: ../output.py:1066
msgid "Replaced"
msgstr ""
-#: ../output.py:618
+#: ../output.py:1067
+msgid "Failed"
+msgstr ""
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1133
+msgid "two"
+msgstr ""
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
-#: ../output.py:628
+#: ../output.py:1155
msgid "user interrupt"
msgstr ""
-#: ../output.py:639
+#: ../output.py:1173
+msgid "Total"
+msgstr ""
+
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "A executar a transacção de teste:"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "A executar a transacção de teste:"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Nome : %s"
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "Repo : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+msgid "Aborted"
+msgstr ""
+
+#: ../output.py:1389
+msgid "Failure:"
+msgstr ""
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Transacção Completa"
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Não foram encontrados pacotes"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Erro SO: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
#, fuzzy
msgid "installed"
msgstr "Instalado: "
-#: ../output.py:640
+#: ../output.py:1525
#, fuzzy
msgid "updated"
msgstr "Actualizado: "
-#: ../output.py:641
+#: ../output.py:1526
msgid "obsoleted"
msgstr ""
-#: ../output.py:642
+#: ../output.py:1527
#, fuzzy
msgid "erased"
msgstr "Removido: "
-#: ../output.py:646
+#: ../output.py:1531
#, fuzzy, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr ""
"O pacote instalado: %s.%s %s:%s-%s corresponde com o\n"
" %s"
-#: ../output.py:653
+#: ../output.py:1538
#, fuzzy
msgid "--> Running transaction check"
msgstr "A executar a transacção de teste:"
-#: ../output.py:658
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr ""
-#: ../output.py:663
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr ""
-#: ../output.py:668
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr ""
-#: ../output.py:673
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr ""
-#: ../output.py:679
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr ""
-#: ../output.py:682
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
-#: ../output.py:686
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
-#: ../yumcommands.py:36
+#: ../utils.py:137 ../yummain.py:42
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr "A Sair por Ordem do Utilizador"
+
+#: ../utils.py:143 ../yummain.py:48
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr "A Sair por Ordem do Utilizador"
+
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr ""
+
+#: ../yumcommands.py:42
#, fuzzy
msgid "You need to be root to perform this command."
msgstr "Terá de ser 'root' para executar estes comandos"
-#: ../yumcommands.py:43
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -809,334 +1154,518 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
-#: ../yumcommands.py:63
+#: ../yumcommands.py:69
#, fuzzy, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Tem de passar uma lista de pacotes a remover"
-#: ../yumcommands.py:69
+#: ../yumcommands.py:75
#, fuzzy
msgid "Error: Need an item to match"
msgstr "É necessário um item a procurar"
-#: ../yumcommands.py:75
+#: ../yumcommands.py:81
#, fuzzy
msgid "Error: Need a group or list of groups"
msgstr "É necessária uma lista de grupos a actualizar"
-#: ../yumcommands.py:84
+#: ../yumcommands.py:90
#, fuzzy, python-format
msgid "Error: clean requires an option: %s"
msgstr "Erro ao criar a pasta %s: %s"
-#: ../yumcommands.py:89
+#: ../yumcommands.py:95
#, fuzzy, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Erro ao processar os argumentos da linha de comandos: %s"
-#: ../yumcommands.py:102
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr ""
-#: ../yumcommands.py:105
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr ""
-#: ../yumcommands.py:109
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
-#: ../yumcommands.py:115
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
-#: ../yumcommands.py:156
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr ""
-#: ../yumcommands.py:159
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:168
+#: ../yumcommands.py:180
#, fuzzy
msgid "Setting up Install Process"
msgstr "À Procura nos Pacotes Instalados:"
-#: ../yumcommands.py:179
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr ""
-#: ../yumcommands.py:182
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:190
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr ""
-#: ../yumcommands.py:204
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr ""
-#: ../yumcommands.py:212
+#: ../yumcommands.py:295
#, fuzzy
msgid "Installed Packages"
msgstr "À Procura nos Pacotes Instalados:"
-#: ../yumcommands.py:213
+#: ../yumcommands.py:303
#, fuzzy
msgid "Available Packages"
msgstr "À Procura de Pacotes Disponíveis:"
-#: ../yumcommands.py:214
+#: ../yumcommands.py:307
#, fuzzy
msgid "Extra Packages"
msgstr "Não Existe o Pacote %s"
-#: ../yumcommands.py:215
+#: ../yumcommands.py:311
#, fuzzy
msgid "Updated Packages"
msgstr "A procurar os pacotes actualizados"
-#: ../yumcommands.py:221 ../yumcommands.py:225
+#. This only happens in verbose mode
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
#, fuzzy
msgid "Obsoleting Packages"
msgstr "A limpar os pacotes"
-#: ../yumcommands.py:226
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr ""
-#: ../yumcommands.py:232
+#: ../yumcommands.py:335
#, fuzzy
msgid "No matching Packages to list"
msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../yumcommands.py:246
+#: ../yumcommands.py:349
#, fuzzy
msgid "List a package or groups of packages"
msgstr "À procura nos pacotes instalados por um pacote necessário"
-#: ../yumcommands.py:258
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr ""
-#: ../yumcommands.py:266
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr ""
-#: ../yumcommands.py:278
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr ""
-#: ../yumcommands.py:284
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr ""
-#: ../yumcommands.py:297
+#: ../yumcommands.py:401
#, fuzzy
msgid "List available package groups"
msgstr "À Procura de Pacotes Disponíveis:"
-#: ../yumcommands.py:314
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr ""
-#: ../yumcommands.py:336
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr ""
-#: ../yumcommands.py:360
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr ""
-#: ../yumcommands.py:384
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr ""
-#: ../yumcommands.py:390
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr ""
-#: ../yumcommands.py:391
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
-#: ../yumcommands.py:412
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr ""
-#: ../yumcommands.py:426
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr ""
-#: ../yumcommands.py:447
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr ""
-#: ../yumcommands.py:467
+#: ../yumcommands.py:573
#, fuzzy
msgid "Check for available package updates"
msgstr "A remover o item dos pacotes disponíveis"
-#: ../yumcommands.py:490
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr ""
-#: ../yumcommands.py:496
+#: ../yumcommands.py:629
#, fuzzy
msgid "Searching Packages: "
msgstr "A limpar os pacotes"
-#: ../yumcommands.py:513
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr ""
-#: ../yumcommands.py:522
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr ""
-#: ../yumcommands.py:536
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr ""
-#: ../yumcommands.py:545
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr ""
-#: ../yumcommands.py:564
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr ""
-#: ../yumcommands.py:567
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr ""
-#: ../yumcommands.py:581
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr ""
-#: ../yumcommands.py:587
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr ""
-#: ../yumcommands.py:605
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr ""
-#: ../yumcommands.py:611
+#: ../yumcommands.py:742
#, fuzzy
msgid "Finding dependencies: "
msgstr "A resolver as dependências"
-#: ../yumcommands.py:627
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo id"
+#: ../yumcommands.py:810 ../yumcommands.py:811
+msgid "enabled"
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo name"
+#: ../yumcommands.py:819 ../yumcommands.py:820
+msgid "disabled"
msgstr ""
-#: ../yumcommands.py:645
-msgid "status"
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
+msgstr "Repo : %s"
+
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
+msgstr "Versão: %s"
+
+#: ../yumcommands.py:836
+msgid "Repo-status : "
msgstr ""
-#: ../yumcommands.py:651
-msgid "enabled"
+#: ../yumcommands.py:838
+msgid "Repo-revision: "
msgstr ""
-#: ../yumcommands.py:654
-msgid "disabled"
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
+msgstr "Versão: %s"
+
+#: ../yumcommands.py:848
+msgid "Repo-distro-tags: "
+msgstr ""
+
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
+msgstr "Actualizado: "
+
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
+msgstr "Repo : %s"
+
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
+msgstr "Versão: %s"
+
+#: ../yumcommands.py:863
+msgid "Repo-baseurl : "
+msgstr ""
+
+#: ../yumcommands.py:871
+msgid "Repo-metalink: "
+msgstr ""
+
+#: ../yumcommands.py:875
+#, fuzzy
+msgid " Updated : "
+msgstr "Actualizado: "
+
+#: ../yumcommands.py:878
+msgid "Repo-mirrors : "
+msgstr ""
+
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
msgstr ""
-#: ../yumcommands.py:671
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, python-format
+msgid "Instant (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:895
+msgid "Repo-expire : "
+msgstr ""
+
+#: ../yumcommands.py:898
+msgid "Repo-exclude : "
+msgstr ""
+
+#: ../yumcommands.py:902
+msgid "Repo-include : "
+msgstr ""
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:912 ../yumcommands.py:938
+msgid "repo id"
+msgstr ""
+
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
+msgid "status"
+msgstr ""
+
+#: ../yumcommands.py:939
+msgid "repo name"
+msgstr ""
+
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr ""
-#: ../yumcommands.py:705
+#: ../yumcommands.py:999
#, fuzzy, python-format
msgid "No help available for %s"
msgstr "Não Há Pacotes Disponíveis para Actualizar"
-#: ../yumcommands.py:710
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
"aliases: "
msgstr ""
-#: ../yumcommands.py:712
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
"alias: "
msgstr ""
-#: ../yumcommands.py:741
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr ""
-#: ../yumcommands.py:755
+#: ../yumcommands.py:1042
#, fuzzy
msgid "reinstall a package"
msgstr "A limpar os pacotes"
-#: ../yummain.py:41
+#: ../yumcommands.py:1060
#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
-msgstr "A Sair por Ordem do Utilizador"
+msgid "Setting up Downgrade Process"
+msgstr "À Procura nos Pacotes Instalados:"
-#: ../yummain.py:47
+#: ../yumcommands.py:1067
#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
-msgstr "A Sair por Ordem do Utilizador"
+msgid "downgrade a package"
+msgstr "A limpar os pacotes"
+
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
+msgstr ""
+
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr "Grupo : %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Não Existe o Pacote %s"
+
+#: ../yumcommands.py:1152
+#, fuzzy
+msgid "Installed:"
+msgstr "Instalado: "
+
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Instalado: "
+
+#: ../yumcommands.py:1166
+#, fuzzy
+msgid "Available:"
+msgstr "À Procura de Pacotes Disponíveis:"
+
+#: ../yumcommands.py:1172
+msgid "Group-Available:"
+msgstr ""
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
+
+#: ../yummain.py:128
+msgid "Running"
+msgstr ""
+
+#: ../yummain.py:129
+msgid "Sleeping"
+msgstr ""
+
+#: ../yummain.py:130
+msgid "Uninteruptable"
+msgstr ""
+
+#: ../yummain.py:131
+msgid "Zombie"
+msgstr ""
+
+#: ../yummain.py:132
+msgid "Traced/Stopped"
+msgstr ""
+
+#: ../yummain.py:137
+msgid " The other application is: PackageKit"
+msgstr ""
+
+#: ../yummain.py:139
+#, python-format
+msgid " The other application is: %s"
+msgstr ""
+
+#: ../yummain.py:142
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr ""
+
+#: ../yummain.py:146
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr ""
-#: ../yummain.py:105
+#: ../yummain.py:148
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr ""
+
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
-#: ../yummain.py:132 ../yummain.py:171
+#: ../yummain.py:201 ../yummain.py:240
#, fuzzy, python-format
msgid "Error: %s"
msgstr "Erro SO: %s"
-#: ../yummain.py:142 ../yummain.py:178
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr ""
#. Depsolve stage
-#: ../yummain.py:149
+#: ../yummain.py:218
#, fuzzy
msgid "Resolving Dependencies"
msgstr "A resolver as dependências"
-#: ../yummain.py:184
+#: ../yummain.py:242
+msgid " You could try using --skip-broken to work around the problem"
+msgstr ""
+
+#: ../yummain.py:243
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+
+#: ../yummain.py:259
#, fuzzy
msgid ""
"\n"
"Dependencies Resolved"
msgstr "Dependências resolvidas"
-#: ../yummain.py:198
-msgid "Complete!"
-msgstr ""
-
-#: ../yummain.py:245
+#: ../yummain.py:326
#, fuzzy
msgid ""
"\n"
@@ -1148,689 +1677,743 @@ msgstr "A Sair por Ordem do Utilizador"
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/depsolve.py:95
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr ""
-#: ../yum/depsolve.py:136
+#: ../yum/depsolve.py:148
#, fuzzy, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "A opção do 'clean' é inválida %s"
-#: ../yum/depsolve.py:147
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr ""
-#: ../yum/depsolve.py:170
+#: ../yum/depsolve.py:175
#, fuzzy, python-format
msgid "Potential match for %s from %s"
msgstr "bestarch = %s para %s"
-#: ../yum/depsolve.py:178
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr ""
-#: ../yum/depsolve.py:219
+#: ../yum/depsolve.py:224
#, fuzzy, python-format
msgid "Member: %s"
msgstr "Servidor: %s"
-#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr ""
-#: ../yum/depsolve.py:240
+#: ../yum/depsolve.py:245
#, fuzzy, python-format
msgid "Adding Package %s in mode %s"
msgstr "Não Existe o Pacote %s, %s"
-#: ../yum/depsolve.py:250
+#: ../yum/depsolve.py:255
#, fuzzy, python-format
msgid "Removing Package %s"
msgstr "Não Existe o Pacote %s"
-#: ../yum/depsolve.py:261
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr ""
-#: ../yum/depsolve.py:312
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr ""
-#: ../yum/depsolve.py:322
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr ""
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr ""
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr ""
-#: ../yum/depsolve.py:356
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr ""
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr ""
-#: ../yum/depsolve.py:372
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:407
#, fuzzy, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Não foi detectado um pacote correspondente ao %s"
-#: ../yum/depsolve.py:388
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr ""
+#: ../yum/depsolve.py:440
+#, python-format
+msgid "Quick matched %s to require for %s"
+msgstr ""
+
#. is it already installed?
-#: ../yum/depsolve.py:434
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
-#: ../yum/depsolve.py:449
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
-#: ../yum/depsolve.py:460
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
-#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr ""
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr ""
-#: ../yum/depsolve.py:510
-#, python-format
-msgid ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr ""
-
-#: ../yum/depsolve.py:537
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr ""
-#: ../yum/depsolve.py:544
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr ""
-#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
#, fuzzy
msgid "Success - empty transaction"
msgstr "A executar a transacção de teste:"
-#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr ""
-#: ../yum/depsolve.py:702
+#: ../yum/depsolve.py:755
#, fuzzy
msgid "Dependency Process ending"
msgstr "Dependências resolvidas"
-#: ../yum/depsolve.py:708
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr ""
-#: ../yum/depsolve.py:715
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr ""
-#: ../yum/depsolve.py:729
+#: ../yum/depsolve.py:782
#, fuzzy, python-format
msgid "Checking deps for %s"
msgstr ""
"\n"
"A verificar a assinatura no %s"
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr ""
-#: ../yum/depsolve.py:933
-#, python-format
-msgid "Comparing best: %s to po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:937
-#, python-format
-msgid "Same: best %s == po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
-#, python-format
-msgid "best %s obsoletes po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:955
+#: ../yum/depsolve.py:1007
#, python-format
-msgid "po %s obsoletes best: %s"
+msgid "Running compare_providers() for %s"
msgstr ""
-#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, fuzzy, python-format
msgid "better arch in po %s"
msgstr "bestarch = %s para %s"
-#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#: ../yum/depsolve.py:1142
#, python-format
-msgid "po %s shares a sourcerpm with %s"
+msgid "%s obsoletes %s"
msgstr ""
-#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:1154
#, python-format
-msgid "best %s shares a sourcerpm with %s"
+msgid ""
+"archdist compared %s to %s on %s\n"
+" Winner: %s"
msgstr ""
-#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:1161
#, python-format
-msgid "po %s shares more of the name prefix with %s"
+msgid "common sourcerpm %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1167
#, python-format
-msgid "po %s has a shorter name than best %s"
+msgid "common prefix of %s between %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1175
#, python-format
-msgid "bestpkg %s shares more of the name prefix with %s"
+msgid "Best Order: %s"
msgstr ""
-#: ../yum/__init__.py:119
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:296
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr ""
-#: ../yum/__init__.py:332
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr ""
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:349
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr ""
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:387
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:404
+#: ../yum/__init__.py:539
#, fuzzy
msgid "Setting up Package Sacks"
msgstr "A limpar os pacotes"
-#: ../yum/__init__.py:447
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr ""
-#: ../yum/__init__.py:448
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr ""
-#: ../yum/__init__.py:453
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:465
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr ""
-#: ../yum/__init__.py:496
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:520
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr ""
-#: ../yum/__init__.py:546
+#: ../yum/__init__.py:688
#, fuzzy, python-format
msgid "Adding group file from repository: %s"
msgstr "a obter os grupos do servidor: %s"
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr ""
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr ""
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr ""
-#: ../yum/__init__.py:657
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr ""
-#: ../yum/__init__.py:680
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr ""
-#: ../yum/__init__.py:681
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
msgstr ""
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr ""
-#: ../yum/__init__.py:774
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+
+#: ../yum/__init__.py:1101
#, fuzzy, python-format
msgid "Failed to remove transaction file %s"
msgstr "Não é possível encontrar a secção: %s"
-#: ../yum/__init__.py:814
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr ""
-
-#: ../yum/__init__.py:845
-msgid "Excluding Packages in global exclude list"
+msgid "%s was supposed to be installed but is not!"
msgstr ""
-#: ../yum/__init__.py:847
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Excluding Packages from %s"
-msgstr ""
-
-#: ../yum/__init__.py:875
-#, fuzzy, python-format
-msgid "Reducing %s to included packages only"
-msgstr "A procurar os pacotes obsoletos"
-
-#: ../yum/__init__.py:880
-#, fuzzy, python-format
-msgid "Keeping included package %s"
-msgstr "A procurar os pacotes actualizados"
-
-#: ../yum/__init__.py:886
-#, fuzzy, python-format
-msgid "Removing unmatched package %s"
-msgstr "A procurar os pacotes actualizados"
-
-#: ../yum/__init__.py:889
-msgid "Finished"
+msgid "%s was supposed to be removed but is not!"
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:919
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Não é possível verificar se o PID %s está activo"
#. Another copy seems to be running.
-#: ../yum/__init__.py:923
+#: ../yum/__init__.py:1293
#, fuzzy, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Bloqueio %s existente: está outra cópia a correr. A sair."
-#: ../yum/__init__.py:970 ../yum/__init__.py:977
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, fuzzy, python-format
+msgid "Could not create lock at %s: %s "
+msgstr "Não foi detectado um pacote correspondente ao %s"
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr ""
-#: ../yum/__init__.py:991
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr ""
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr ""
-#: ../yum/__init__.py:1036
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr ""
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1477
#, python-format
-msgid "Insufficient space in download directory %s to download"
+msgid ""
+"Insufficient space in download directory %s\n"
+" * free %s\n"
+" * needed %s"
msgstr ""
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr ""
-#: ../yum/__init__.py:1134
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-#: ../yum/__init__.py:1189
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr ""
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1622
#, fuzzy, python-format
msgid "Problem opening package %s"
msgstr "A limpar os pacotes"
-#: ../yum/__init__.py:1201
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr ""
-#: ../yum/__init__.py:1205
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr ""
-#: ../yum/__init__.py:1243
+#: ../yum/__init__.py:1672
#, fuzzy, python-format
msgid "Cannot remove %s"
msgstr "Não é possível remover o ficheiro %s"
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr ""
-#: ../yum/__init__.py:1283
+#: ../yum/__init__.py:1712
#, fuzzy, python-format
msgid "Cannot remove %s file %s"
msgstr "Não é possível remover o ficheiro %s"
-#: ../yum/__init__.py:1287
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr ""
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr ""
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: ../yum/__init__.py:1335
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr ""
-#: ../yum/__init__.py:1543
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:2065
#, fuzzy, python-format
msgid "Searching %d packages"
msgstr "A limpar os pacotes"
-#: ../yum/__init__.py:1584
+#: ../yum/__init__.py:2069
#, fuzzy, python-format
msgid "searching package %s"
msgstr "A limpar os pacotes"
-#: ../yum/__init__.py:1596
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr ""
-#: ../yum/__init__.py:1603
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr ""
-#: ../yum/__init__.py:1633
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr ""
-#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#: ../yum/__init__.py:2170
+msgid "No group data available for configured repositories"
+msgstr ""
+
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr ""
-#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr ""
-#: ../yum/__init__.py:1770
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr ""
-#: ../yum/__init__.py:1774
+#: ../yum/__init__.py:2283
#, fuzzy, python-format
msgid "No package named %s available to be installed"
msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
-msgid "Invalid versioned dependency string, try quoting it."
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
#, fuzzy
msgid "Invalid version flag"
msgstr "A opção do 'clean' é inválida %s"
-#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, fuzzy, python-format
msgid "No Package found for %s"
msgstr "Não foram encontrados pacotes"
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr ""
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr ""
-#. only one in there
-#: ../yum/__init__.py:2085
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr ""
-#. FIXME - this is where we could check to see if it already installed
-#. for returning better errors
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2798
+#, fuzzy, python-format
+msgid "Package %s installed and not available"
+msgstr "O %s está instalado e é a última versão."
+
+#: ../yum/__init__.py:2801
#, fuzzy
msgid "No package(s) available to install"
msgstr "Não Estão Disponíveis Pacotes para Listar"
-#: ../yum/__init__.py:2158
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr ""
-#: ../yum/__init__.py:2171
+#: ../yum/__init__.py:2839
+#, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr ""
+
+#: ../yum/__init__.py:2842
+#, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr ""
+
+#: ../yum/__init__.py:2850
#, fuzzy, python-format
msgid "Package %s already installed and latest version"
msgstr "O %s está instalado e é a última versão."
-#: ../yum/__init__.py:2178
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
#. update everything (the easy case)
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:2304
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:2377
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr ""
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:3093
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Não Estão Disponíveis Pacotes para Listar"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, fuzzy, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Não é possível remover o ficheiro %s"
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, fuzzy, python-format
msgid "Examining %s: %s"
msgstr "a ignorar o SRPM: %s"
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-#: ../yum/__init__.py:2468
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, fuzzy, python-format
msgid "Excluding %s"
msgstr "a adicionar o %s"
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr ""
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr ""
-#: ../yum/__init__.py:2486
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr ""
-#: ../yum/__init__.py:2504
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2515
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr ""
-#: ../yum/__init__.py:2522
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, python-format
+msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:3515
+#, fuzzy
+msgid "No package(s) available to downgrade"
+msgstr "Não Estão Disponíveis Pacotes para Listar"
+
+#: ../yum/__init__.py:3559
+#, fuzzy, python-format
+msgid "No Match for available package: %s"
+msgstr "A remover o item dos pacotes disponíveis"
+
+#: ../yum/__init__.py:3565
+#, fuzzy, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "A remover o item dos pacotes disponíveis"
+
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Não é um ficheiro normal: %s"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr ""
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr ""
-#: ../yum/__init__.py:2589
-msgid "GPG key parsing failed: "
+#: ../yum/__init__.py:3735
+#, python-format
+msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
-#: ../yum/__init__.py:2593
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr ""
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr ""
-#: ../yum/__init__.py:2610
+#: ../yum/__init__.py:3789
#, fuzzy
msgid "Not installing key"
msgstr "Erros na instalação:"
-#: ../yum/__init__.py:2616
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr ""
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr ""
-#: ../yum/__init__.py:2624
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1838,104 +2421,150 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: ../yum/__init__.py:2633
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: ../yum/__init__.py:2707
+#: ../yum/__init__.py:3829
+#, python-format
+msgid "GPG key at %s (0x%s) is already imported"
+msgstr ""
+
+#: ../yum/__init__.py:3849
+#, fuzzy, python-format
+msgid "Not installing key for repo %s"
+msgstr "Erros na instalação:"
+
+#: ../yum/__init__.py:3854
+msgid "Key import failed"
+msgstr ""
+
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr ""
-#: ../yum/__init__.py:2709
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:2774
+#: ../yum/__init__.py:4028
+#, python-format
+msgid "Please report this error at %s"
+msgstr ""
+
+#: ../yum/__init__.py:4052
#, fuzzy
msgid "Test Transaction Errors: "
msgstr "A executar a transacção de teste:"
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:195
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr ""
-#: ../yum/plugins.py:206
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, fuzzy, python-format
msgid "No plugin match for: %s"
msgstr "Remover: Nada corresponde ao %s"
-#: ../yum/plugins.py:219
+#: ../yum/plugins.py:252
#, python-format
-msgid "\"%s\" plugin is disabled"
+msgid "Not loading \"%s\" plugin, as it is disabled"
msgstr ""
-#: ../yum/plugins.py:231
+#. Give full backtrace:
+#: ../yum/plugins.py:264
+#, python-format
+msgid "Plugin \"%s\" can't be imported"
+msgstr ""
+
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr ""
-#: ../yum/plugins.py:235
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr ""
-#: ../yum/plugins.py:264
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr ""
-#: ../yum/plugins.py:271
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr ""
-#: ../yum/plugins.py:291
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr ""
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:294
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr ""
-#: ../yum/plugins.py:448
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr ""
-#: ../rpmUtils/oldUtils.py:26
+#: ../yum/rpmtrans.py:78
+#, fuzzy
+msgid "Repackaging"
+msgstr "A limpar os pacotes"
+
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "O cabeçalho não pôde ser aberto ou não corresponde ao %s, %s."
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr "O RPM %s falha no código MD5"
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr "Não foi ler a base de dados do RPM. Talvez já esteja a ser usada?"
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Foi obtido um cabeçalho vazio; algo se passa de errado"
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Cabeçalho %s Danificado"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Erro ao abrir o RPM %s - erro %s"
+#, fuzzy
+#~ msgid "Parsing package install arguments"
+#~ msgstr "Erro ao processar os argumentos da linha de comandos: %s"
+
+#, fuzzy
+#~ msgid "Reducing %s to included packages only"
+#~ msgstr "A procurar os pacotes obsoletos"
+
+#, fuzzy
+#~ msgid "Keeping included package %s"
+#~ msgstr "A procurar os pacotes actualizados"
+
+#, fuzzy
+#~ msgid "Removing unmatched package %s"
+#~ msgstr "A procurar os pacotes actualizados"
+
#~ msgid "Directory of rpms must exist"
#~ msgstr "A pasta de RPMs deverá existir"
@@ -2035,9 +2664,6 @@ msgstr "Erro ao abrir o RPM %s - erro %s"
#~ msgid "Found %s."
#~ msgstr "O %s foi encontrado."
-#~ msgid "Transaction(s) Complete"
-#~ msgstr "Transacção Completa"
-
#~ msgid "IOError: %s"
#~ msgstr "Erro E/S: %s"
@@ -2376,9 +3002,6 @@ msgstr "Erro ao abrir o RPM %s - erro %s"
#~ msgid "Name"
#~ msgstr "Nome"
-#~ msgid "[install: %s]"
-#~ msgstr "[instalar: %s]"
-
#~ msgid "Downloading needed headers"
#~ msgstr "A obter os cabeçalhos necessários"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 949ad32..32a16af 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 10:04+0000\n"
-"PO-Revision-Date: 2009-10-07 12:06-0300\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
+"PO-Revision-Date: 2009-11-02 11:15-0300\n"
"Last-Translator: Igor Pires Soares <igor@projetofedora.org>\n"
"Language-Team: Brazilian Portuguese <fedora-trans-pt_br@redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -46,12 +46,12 @@ msgstr "Obsoletos"
#: ../callback.py:54
#: ../output.py:1063
-#: ../output.py:1401
+#: ../output.py:1403
msgid "Updated"
msgstr "Atualizados"
#: ../callback.py:55
-#: ../output.py:1397
+#: ../output.py:1399
msgid "Erased"
msgstr "Removidos"
@@ -59,7 +59,7 @@ msgstr "Removidos"
#: ../callback.py:57
#: ../callback.py:59
#: ../output.py:1061
-#: ../output.py:1393
+#: ../output.py:1395
msgid "Installed"
msgstr "Instalados"
@@ -91,63 +91,63 @@ msgstr "Removendo"
msgid "Cleanup"
msgstr "Limpeza"
-#: ../cli.py:108
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Comando \"%s\" já definido"
-#: ../cli.py:120
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Configurando repositórios"
-#: ../cli.py:131
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Lendo metadados do repositório a partir dos arquivos locais"
-#: ../cli.py:194
-#: ../utils.py:102
+#: ../cli.py:192
+#: ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Erro de configuração: %s"
-#: ../cli.py:197
-#: ../cli.py:1253
-#: ../utils.py:105
+#: ../cli.py:195
+#: ../cli.py:1251
+#: ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Erro nas opções: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Instalados: %s-%s em %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Construídos : %s em %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Enviados: %s em %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Você precisa dar algum comando"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Requisitos de disco:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Pelo menos %d MB são necessários no sistema de arquivos %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -155,67 +155,67 @@ msgstr ""
"Sumário de erros\n"
"-------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Tentando executar a transação, mas não há nada a ser feito. Saindo."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Saindo pelo comando do usuário"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Baixando pacotes:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Erro ao baixar pacotes:\n"
-#: ../cli.py:420
-#: ../yum/__init__.py:3996
+#: ../cli.py:418
+#: ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Executando o rpm_check_debug"
-#: ../cli.py:429
-#: ../yum/__init__.py:4005
+#: ../cli.py:427
+#: ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "ERRO. Você precisa atualizar o rpm para manipular:"
-#: ../cli.py:431
-#: ../yum/__init__.py:4008
+#: ../cli.py:429
+#: ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "Erro com o rpm_check_debug vs depsolve:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "O RPM precisa ser atualizado"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Por favor, relate esse erro em %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Executando teste de transação"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Teste de transação finalizado"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Erro na verificação da transação:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Teste de transação completo"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Executando a transação"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -223,87 +223,87 @@ msgstr ""
"Recusa de importação automática das chaves ao executar de forma não assistida.\n"
"Use \"-y\" para sobrescrever."
-#: ../cli.py:540
-#: ../cli.py:574
+#: ../cli.py:538
+#: ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Talvez você queira dizer: "
-#: ../cli.py:557
-#: ../cli.py:565
+#: ../cli.py:555
+#: ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Pacotes %s%s%s disponíveis, mas já instalados."
-#: ../cli.py:571
-#: ../cli.py:602
-#: ../cli.py:680
+#: ../cli.py:569
+#: ../cli.py:600
+#: ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Nenhum pacote %s%s%s disponível."
-#: ../cli.py:607
-#: ../cli.py:740
+#: ../cli.py:605
+#: ../cli.py:738
msgid "Package(s) to install"
msgstr "Pacotes a serem instalados"
-#: ../cli.py:608
-#: ../cli.py:686
-#: ../cli.py:719
-#: ../cli.py:741
+#: ../cli.py:606
+#: ../cli.py:684
+#: ../cli.py:717
+#: ../cli.py:739
#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Nada a ser feito"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d pacotes marcados para atualização"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Nenhum pacote marcado para atualização"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d pacotes marcados para remoção"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Nenhum pacote marcado para remoção"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Pacote(s) a ser(em) retrocedido(s)"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (a partir de %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "O pacote instalado %s%s%s%s não está disponível."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Pacote(s) a ser(em) reinstalado(s)"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Nenhum pacote fornecido"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Aviso: nenhum resultado para: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Nenhum pacote localizado"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -312,109 +312,109 @@ msgstr ""
"Aviso: as versões 3.0.x do yum iriam corresponder erroneamente pelos nomes de arquivos.\n"
" Você pode usar \"%s*/%s%s\" e/ou \"%s*bin/%s%s\" para obter esse comportamento."
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Nenhum pacote localizado para %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Limpando tudo"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Limpando cabeçalhos"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Limpando pacotes"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Limpando metadados em xml"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Limpando cache do banco de dados"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Limpando metadados expirados do cache"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Limpando plugins"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Grupos instalados:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Grupos disponíveis:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Concluído"
-#: ../cli.py:972
-#: ../cli.py:990
-#: ../cli.py:996
-#: ../yum/__init__.py:2622
+#: ../cli.py:970
+#: ../cli.py:988
+#: ../cli.py:994
+#: ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Aviso: O grupo %s não existe."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr "Nenhum pacote disponível para instalação ou atualização nos grupos requisitados"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d pacote(s) a ser(em) instalado(s)"
-#: ../cli.py:1012
-#: ../yum/__init__.py:2634
+#: ../cli.py:1010
+#: ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Nenhum grupo de nome %s existe"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Nenhum pacote a ser removido a partir dos grupos"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d pacote(s) a ser(em) removido(s)"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "O pacote %s já está instalado, ignorando"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Descartando pacote não comparável %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr "Nenhum outro %s instalado, adicionado à lista para potencial instalação"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Opções do plugin"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Erro na linha de comando: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -425,103 +425,103 @@ msgstr ""
"\n"
"%s: a opção %s requer um argumento"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color aceita uma destas opções: auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "mostrar essa mensagem ajuda e sai"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "ser tolerante com os erros"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "executar por completo a partir do cache, não atualiza o cache"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "configurar localização do arquivo"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "Tempo máximo de espera do comando"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "nível de depuração na saída"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "mostrar duplicados em repos e em comandos de pesquisa/listagem"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "nível de erro na saída"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "operação discreta"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "operação detalhada"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "responder sim para todas as perguntas"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "mostrar versão do Yum ao sair"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "definir raiz de instalação"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "habilitar um ou mais repositórios (curingas são permitidos)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "desabilitar um ou mais repositórios (curingas são permitidos)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "excluir pacote(s) por nome ou glob"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "desabilitar a exclusão a partir do principal, para um repositório ou para tudo"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "Habilitar processo de obsolescência durante as atualizações"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "desabilitar plugins do Yum"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "desabilitar verificação de assinaturas gpg"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "desabilitar plugins pelo nome"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "habilita plugins pelo nome"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "ignorar pacotes com problemas de solução de dependências"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "controla o uso da cor"
@@ -911,199 +911,207 @@ msgstr "interrupção do usuário"
msgid "Total"
msgstr "Total"
-#: ../output.py:1201
+#: ../output.py:1203
msgid "<unset>"
msgstr "<indefinido>"
-#: ../output.py:1202
+#: ../output.py:1204
msgid "System"
msgstr "Sistema"
-#: ../output.py:1238
+#: ../output.py:1240
msgid "Bad transaction IDs, or package(s), given"
msgstr "IDs de transação ou pacote(s) fornecido(s) inválido(s)"
-#: ../output.py:1282
+#: ../output.py:1284
#: ../yumcommands.py:1149
-#: ../yum/__init__.py:1060
+#: ../yum/__init__.py:1067
msgid "Warning: RPMDB has been altered since the last yum transaction."
msgstr "Aviso: o RPMDB foi alterado desde a última transação do yum."
-#: ../output.py:1287
+#: ../output.py:1289
msgid "No transaction ID given"
msgstr "Nenhum ID de transação fornecido"
-#: ../output.py:1295
+#: ../output.py:1297
msgid "Bad transaction ID given"
msgstr "O ID de transação fornecido é inválido"
-#: ../output.py:1300
+#: ../output.py:1302
msgid "Not found given transaction ID"
msgstr "O ID de transação dado não foi localizado"
-#: ../output.py:1308
+#: ../output.py:1310
msgid "Found more than one transaction ID!"
msgstr "Foi localizado mais de um ID de transação!"
-#: ../output.py:1329
+#: ../output.py:1331
msgid "No transaction ID, or package, given"
msgstr "Nenhum ID de transação ou pacote fornecido"
-#: ../output.py:1355
+#: ../output.py:1357
msgid "Transaction ID :"
msgstr "ID de transação:"
-#: ../output.py:1357
+#: ../output.py:1359
msgid "Begin time :"
msgstr "Horário de início:"
-#: ../output.py:1360
#: ../output.py:1362
+#: ../output.py:1364
msgid "Begin rpmdb :"
msgstr "Início do rpmdb:"
-#: ../output.py:1376
+#: ../output.py:1378
#, python-format
msgid "(%s seconds)"
msgstr "(%s segundos)"
-#: ../output.py:1377
+#: ../output.py:1379
msgid "End time :"
msgstr "Horário do fim:"
-#: ../output.py:1380
#: ../output.py:1382
+#: ../output.py:1384
msgid "End rpmdb :"
msgstr "Fim do rpmdb:"
-#: ../output.py:1383
+#: ../output.py:1385
msgid "User :"
msgstr "Usuário:"
-#: ../output.py:1385
#: ../output.py:1387
#: ../output.py:1389
+#: ../output.py:1391
msgid "Return-Code :"
msgstr "Código de retorno:"
-#: ../output.py:1385
+#: ../output.py:1387
msgid "Aborted"
msgstr "Interrompido"
-#: ../output.py:1387
+#: ../output.py:1389
msgid "Failure:"
msgstr "Falha:"
-#: ../output.py:1389
+#: ../output.py:1391
msgid "Success"
msgstr "Sucesso"
-#: ../output.py:1390
-msgid "Transaction performed with :"
+#: ../output.py:1392
+msgid "Transaction performed with:"
msgstr "Transação realizada com:"
-#: ../output.py:1403
+#: ../output.py:1405
msgid "Downgraded"
msgstr "Desatualizados"
#. multiple versions installed, both older and newer
-#: ../output.py:1405
+#: ../output.py:1407
msgid "Weird"
msgstr "Estranho"
-#: ../output.py:1407
+#: ../output.py:1409
msgid "Packages Altered:"
msgstr "Pacotes alterados:"
-#: ../output.py:1475
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr "Saída do scriptlet:"
+
+#: ../output.py:1418
+msgid "Errors:"
+msgstr "Erros:"
+
+#: ../output.py:1489
msgid "Last day"
msgstr "Ontem"
-#: ../output.py:1476
+#: ../output.py:1490
msgid "Last week"
msgstr "Uma semana atrás"
-#: ../output.py:1477
+#: ../output.py:1491
msgid "Last 2 weeks"
msgstr "2 semanas atrás"
#. US default :p
-#: ../output.py:1478
+#: ../output.py:1492
msgid "Last 3 months"
msgstr "3 meses atrás"
-#: ../output.py:1479
+#: ../output.py:1493
msgid "Last 6 months"
msgstr "6 meses atrás"
-#: ../output.py:1480
+#: ../output.py:1494
msgid "Last year"
msgstr "Ano passado"
-#: ../output.py:1481
+#: ../output.py:1495
msgid "Over a year ago"
msgstr "Há mais de um ano"
-#: ../output.py:1510
+#: ../output.py:1524
msgid "installed"
msgstr "instalado"
-#: ../output.py:1511
+#: ../output.py:1525
msgid "updated"
msgstr "atualizado"
-#: ../output.py:1512
+#: ../output.py:1526
msgid "obsoleted"
msgstr "obsoleto"
-#: ../output.py:1513
+#: ../output.py:1527
msgid "erased"
msgstr "removido"
-#: ../output.py:1517
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Pacote %s.%s %s:%s-%s definido para ser %s"
-#: ../output.py:1524
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Executando verificação da transação"
-#: ../output.py:1529
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Reiniciando resolução de dependências com as novas alterações."
-#: ../output.py:1534
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Resolução de dependências finalizada"
-#: ../output.py:1539
-#: ../output.py:1544
+#: ../output.py:1553
+#: ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Processando dependência: %s para o pacote: %s"
-#: ../output.py:1548
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Dependência não resolvida: %s"
-#: ../output.py:1554
-#: ../output.py:1559
+#: ../output.py:1568
+#: ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Processando conflito: %s conflita com %s"
-#: ../output.py:1563
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Construindo conjunto de transações com os pacotes selecionados. Por favor aguarde."
-#: ../output.py:1567
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "--> Baixando cabeçalho do %s para inclusão no conjunto de transações."
-#: ../utils.py:132
+#: ../utils.py:137
#: ../yummain.py:42
msgid ""
"\n"
@@ -1114,7 +1122,7 @@ msgstr ""
"\n"
"Saindo pelo cancelamento do usuário"
-#: ../utils.py:138
+#: ../utils.py:143
#: ../yummain.py:48
msgid ""
"\n"
@@ -1125,7 +1133,7 @@ msgstr ""
"\n"
"Saindo por um pipe defeituoso"
-#: ../utils.py:140
+#: ../utils.py:145
#: ../yummain.py:50
#, python-format
msgid ""
@@ -1137,7 +1145,7 @@ msgstr ""
"\n"
"%s"
-#: ../utils.py:179
+#: ../utils.py:184
#: ../yummain.py:273
msgid "Complete!"
msgstr "Concluído!"
@@ -1686,147 +1694,147 @@ msgstr ""
"\n"
"Saindo pelo cancelamento do usuário."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() será removida em uma futura versão do Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Configurando TransactionSets antes da ativação da classe de configuração"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "tsflag inválido no arquivo de configuração: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Pesquisando pkgSack para a dep.: %s"
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Correspondência potencial para o %s a partir de %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "%s encontrado para solicitar o %s"
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Membro: %s"
-#: ../yum/depsolve.py:239
+#: ../yum/depsolve.py:238
#: ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s convertido para instalar"
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Adicionando pacote %s no modo %s"
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Removendo pacote %s"
-#: ../yum/depsolve.py:278
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s requer: %s"
-#: ../yum/depsolve.py:336
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "O requerimento necessário já foi localizado, enganando"
-#: ../yum/depsolve.py:346
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "O requerimento necessário não é o nome de um pacote. Localizando: %s"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Fornecedor em potencial: %s"
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "O modo é %s para o fornecedor do %s: %s"
-#: ../yum/depsolve.py:380
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Modo para o pacote que fornece o %s: %s"
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: o pacote %s que requer o %s foi marcado para remoção"
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: Tornando %s obsoleto com o %s para resolver a dependência."
-#: ../yum/depsolve.py:400
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Atualizando %s para resolver a dependência."
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Não foi possível encontrar um caminho de atualização para a dep. para: %s"
-#: ../yum/depsolve.py:418
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Requerimento %s insolúvel para o %s"
-#: ../yum/depsolve.py:441
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "%s localizado rapidamente a ser requerido por %s"
#. is it already installed?
-#: ../yum/depsolve.py:483
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s está nos pacotes fornecedores mas já está instalado, removendo."
-#: ../yum/depsolve.py:499
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "O pacote de solução em potencial %s tem uma instância mais nova no ct."
-#: ../yum/depsolve.py:510
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "O pacote de solução em potencial %s tem uma instância mais nova instalada."
-#: ../yum/depsolve.py:518
-#: ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517
+#: ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Dependência faltando: %s é requerido pelo pacote %s"
-#: ../yum/depsolve.py:531
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s já está no ct, pulando esse"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Marcando %s como uma atualização para o %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Marcando %s como uma instalação para o %s"
@@ -2012,71 +2020,71 @@ msgstr ""
msgid " %s from %s"
msgstr " %s a partir de %s"
-#: ../yum/__init__.py:1076
+#: ../yum/__init__.py:1083
msgid "Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr "Aviso: scriptlet ou outros erros não fatais ocorreram durante a transação."
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Falha ao remover o arquivo de transação %s"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1123
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s deveria ter sido instalado mas não foi!"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1162
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s deveria ter sido removido mas não foi!"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1282
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Não foi possível verificar se o PID %s está ativo"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1286
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Bloqueio existente em %s: outra cópia está em execução com o pid %s."
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1321
+#: ../yum/__init__.py:1328
#, python-format
msgid "Could not create lock at %s: %s "
msgstr "Não foi possível criar um bloqueio em %s: %s"
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "O pacote não corresponde ao download pretendido"
-#: ../yum/__init__.py:1381
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Não foi possível realizar a soma de verificação"
-#: ../yum/__init__.py:1384
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "O pacote não corresponde à soma de verificação"
-#: ../yum/__init__.py:1426
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "o pacote falhou na soma de verificação mas o cache está habilitado para o %s"
-#: ../yum/__init__.py:1429
-#: ../yum/__init__.py:1458
+#: ../yum/__init__.py:1436
+#: ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "usando cópia local do %s"
-#: ../yum/__init__.py:1470
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -2087,369 +2095,369 @@ msgstr ""
" * livre %s\n"
" * necessário %s"
-#: ../yum/__init__.py:1519
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "O cabeçalho não está completo."
-#: ../yum/__init__.py:1556
+#: ../yum/__init__.py:1563
#, python-format
msgid "Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr "O cabeçalho não está no cache local e o modo de somente cache está habilitado. Não foi possível baixar o %s."
-#: ../yum/__init__.py:1611
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "A chave pública para o %s não está instalada"
-#: ../yum/__init__.py:1615
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problema ao abrir o pacote %s"
-#: ../yum/__init__.py:1623
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "A chave pública para o %s não é confiável"
-#: ../yum/__init__.py:1627
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "O pacote %s não está assinado"
-#: ../yum/__init__.py:1665
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Não foi possível remover %s"
-#: ../yum/__init__.py:1669
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s removido"
-#: ../yum/__init__.py:1705
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Não foi possível remover %s arquivo %s"
-#: ../yum/__init__.py:1709
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s arquivo %s removido"
-#: ../yum/__init__.py:1711
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s arquivos removidos"
-#: ../yum/__init__.py:1780
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Mais de uma correspondência idêntica no saco para %s"
-#: ../yum/__init__.py:1786
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Nada corresponde ao %s.%s %s:%s-%s a partir da atualização"
-#: ../yum/__init__.py:2019
+#: ../yum/__init__.py:2026
msgid "searchPackages() will go away in a future version of Yum. Use searchGenerator() instead. \n"
msgstr "searchPackages() será removida em uma futura versão do Yum. Ao invés disso, use a searchGenerator().\n"
-#: ../yum/__init__.py:2058
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Pesquisando por %d pacotes"
-#: ../yum/__init__.py:2062
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "pesquisando pelo pacote %s"
-#: ../yum/__init__.py:2074
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "pesquisando nas entradas do arquivo"
-#: ../yum/__init__.py:2081
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "pesquisando nas entradas dos fornecimentos"
-#: ../yum/__init__.py:2114
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Fornecimento combina com: %s"
-#: ../yum/__init__.py:2163
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Nenhum dado de grupos disponível para os repositório configurados"
-#: ../yum/__init__.py:2194
-#: ../yum/__init__.py:2213
-#: ../yum/__init__.py:2244
-#: ../yum/__init__.py:2250
-#: ../yum/__init__.py:2329
-#: ../yum/__init__.py:2333
-#: ../yum/__init__.py:2648
+#: ../yum/__init__.py:2201
+#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257
+#: ../yum/__init__.py:2336
+#: ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Não existe nenhum grupo de nome %s"
-#: ../yum/__init__.py:2225
-#: ../yum/__init__.py:2346
+#: ../yum/__init__.py:2232
+#: ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "o pacote %s não foi marcado no grupo %s"
-#: ../yum/__init__.py:2272
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Adicionando o pacote %s do grupo %s"
-#: ../yum/__init__.py:2276
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Nenhum pacote de nome %s disponível para ser instalado"
-#: ../yum/__init__.py:2373
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "A tupla %s do pacote não pôde ser encontrada no packagesack"
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:2399
#, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr "A tupla %s do pacote não pôde ser localizada no rpmdb"
-#: ../yum/__init__.py:2448
-#: ../yum/__init__.py:2498
+#: ../yum/__init__.py:2455
+#: ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Sinalizador de versão inválido"
-#: ../yum/__init__.py:2468
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:2475
+#: ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Nenhum pacote encontrado para %s"
-#: ../yum/__init__.py:2689
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "O pacote de objeto não era uma instância de pacote de objeto"
-#: ../yum/__init__.py:2693
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Nada especificado para instalar"
-#: ../yum/__init__.py:2709
-#: ../yum/__init__.py:3473
+#: ../yum/__init__.py:2716
+#: ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Verificando por fornecimento virtual ou de arquivo para %s"
-#: ../yum/__init__.py:2715
-#: ../yum/__init__.py:3022
-#: ../yum/__init__.py:3189
-#: ../yum/__init__.py:3479
+#: ../yum/__init__.py:2722
+#: ../yum/__init__.py:3037
+#: ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Nenhuma correspondência para o argumento: %s"
-#: ../yum/__init__.py:2791
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Pacote %s instalado, mas não disponível"
-#: ../yum/__init__.py:2794
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Nenhum pacote disponível para instalar"
-#: ../yum/__init__.py:2806
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Pacote: %s - já está no conjunto de transações"
-#: ../yum/__init__.py:2832
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "O pacote %s foi tornado obsoleto pelo %s, o qual já está instalado"
-#: ../yum/__init__.py:2835
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "O pacote %s foi tornado obsoleto por %s, tentando instalar %s ao invés disso"
-#: ../yum/__init__.py:2843
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "O pacote %s já está instalado em sua última versão"
-#: ../yum/__init__.py:2857
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "O pacote %s já está instalado. Verificando por uma atualização."
#. update everything (the easy case)
-#: ../yum/__init__.py:2951
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Atualizando tudo"
-#: ../yum/__init__.py:2972
-#: ../yum/__init__.py:3087
-#: ../yum/__init__.py:3116
-#: ../yum/__init__.py:3143
+#: ../yum/__init__.py:2987
+#: ../yum/__init__.py:3102
+#: ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Pacote já obsoleto não será atualizado: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3007
-#: ../yum/__init__.py:3186
+#: ../yum/__init__.py:3022
+#: ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3078
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "O pacote já está obsoleto: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3111
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Não atualizando o pacote que está obsoleto: %s"
-#: ../yum/__init__.py:3120
-#: ../yum/__init__.py:3147
+#: ../yum/__init__.py:3133
+#: ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Pacote já atualizado não será atualizado novamente: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3202
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Nenhum pacote encontrado para remoção"
-#: ../yum/__init__.py:3235
-#: ../yum/__init__.py:3339
-#: ../yum/__init__.py:3428
+#: ../yum/__init__.py:3251
+#: ../yum/__init__.py:3349
+#: ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Não foi possível abrir o arquivo: %s. Ignorando."
-#: ../yum/__init__.py:3238
-#: ../yum/__init__.py:3342
-#: ../yum/__init__.py:3431
+#: ../yum/__init__.py:3254
+#: ../yum/__init__.py:3352
+#: ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Examinando %s: %s"
-#: ../yum/__init__.py:3246
-#: ../yum/__init__.py:3345
-#: ../yum/__init__.py:3434
+#: ../yum/__init__.py:3262
+#: ../yum/__init__.py:3355
+#: ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr "Não foi possível adicionar o pacote %s à transação. %s não é uma arquitetura compatível."
-#: ../yum/__init__.py:3254
+#: ../yum/__init__.py:3270
#, python-format
msgid "Package %s not installed, cannot update it. Run yum install to install it instead."
msgstr "O pacote %s não está instalado, não é possível atualizá-lo. Execute o yum install para instalá-lo."
-#: ../yum/__init__.py:3289
-#: ../yum/__init__.py:3356
-#: ../yum/__init__.py:3445
+#: ../yum/__init__.py:3299
+#: ../yum/__init__.py:3360
+#: ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Excluindo %s"
-#: ../yum/__init__.py:3294
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Marcando %s para ser instalado"
-#: ../yum/__init__.py:3300
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Marcando %s como uma atualização do %s"
-#: ../yum/__init__.py:3307
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: não atualiza o pacote instalado."
-#: ../yum/__init__.py:3375
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "Problema na reinstalação: nenhum pacote encontrado para remoção"
-#: ../yum/__init__.py:3388
-#: ../yum/__init__.py:3507
+#: ../yum/__init__.py:3392
+#: ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "O pacote %s permite múltiplas instalações, ignorando"
-#: ../yum/__init__.py:3409
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr "Problema na reinstalação: nenhum pacote %s encontrado para instalação"
-#: ../yum/__init__.py:3499
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Nenhum pacote disponível para ser retrocedido"
-#: ../yum/__init__.py:3543
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Nenhuma correspondência disponível para o pacote: %s"
-#: ../yum/__init__.py:3549
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Somente a atualização está disponível para o pacote: %s"
-#: ../yum/__init__.py:3617
-#: ../yum/__init__.py:3654
+#: ../yum/__init__.py:3635
+#: ../yum/__init__.py:3672
#, python-format
msgid "Failed to downgrade: %s"
msgstr "Falha ao desatualizar: %s"
-#: ../yum/__init__.py:3686
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Obtendo a chave GPG a partir de %s"
-#: ../yum/__init__.py:3706
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "A obtenção da chave GPG falhou:"
-#: ../yum/__init__.py:3717
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Falha na análise da chave GPG: ela não tem o valor %s"
-#: ../yum/__init__.py:3749
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "A chave GPG em %s (0x%s) já está instalada"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3754
-#: ../yum/__init__.py:3816
+#: ../yum/__init__.py:3772
+#: ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importando chave GPG 0x%s \"%s\" a partir de %s"
-#: ../yum/__init__.py:3771
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Não está instalando a chave"
-#: ../yum/__init__.py:3777
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Falha na importação da chave (código %d)"
-#: ../yum/__init__.py:3778
-#: ../yum/__init__.py:3837
+#: ../yum/__init__.py:3796
+#: ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Chave importada com sucesso"
-#: ../yum/__init__.py:3783
-#: ../yum/__init__.py:3842
+#: ../yum/__init__.py:3801
+#: ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they are not correct for this package.\n"
@@ -2458,38 +2466,38 @@ msgstr ""
"As chaves GPG listadas para o repositório \"%s\" já estão instaladas, mas não estão corretas para este pacote.\n"
"Verifique se as URLs corretas das chaves estão configuradas para esse repositório."
-#: ../yum/__init__.py:3792
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "A importação da(s) chave(s) não ajudou, chave(s) errada(s)?"
-#: ../yum/__init__.py:3811
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "A chave GPG em %s (0x%s) já foi importada"
-#: ../yum/__init__.py:3831
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "A chave para o repositório %s não será instalada"
-#: ../yum/__init__.py:3836
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Falha na importação da chave"
-#: ../yum/__init__.py:3958
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Não foi possível encontrar um espelho apropriado."
-#: ../yum/__init__.py:3960
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Foram encontrados erros ao baixar os pacotes."
-#: ../yum/__init__.py:4010
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Por favor, relate esse erro em %s"
-#: ../yum/__init__.py:4034
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Erros do teste de transação:"
diff --git a/po/ru.po b/po/ru.po
index 7d04794..791c1af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 11:29+0100\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2003-10-14 15:36+0400\n"
"Last-Translator: Grigory Bakunov <black@asplinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -16,34 +16,36 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.1\n"
-#: ../callback.py:48 ../output.py:512
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr ""
-#: ../callback.py:49
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr ""
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
#, fuzzy
msgid "Installing"
msgstr "Ошибки установки:"
-#: ../callback.py:52 ../callback.py:58
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr ""
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
#, fuzzy
msgid "Updated"
msgstr "Обновлено: "
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
#, fuzzy
msgid "Erased"
msgstr "Удалено: "
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
#, fuzzy
msgid "Installed"
msgstr "Установлено по зависимостям: "
@@ -67,729 +69,1072 @@ msgstr "Ошибка при разборе параметров командно
msgid "Erased: %s"
msgstr "Удалено: "
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr ""
-#: ../callback.py:219
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr ""
-#: ../cli.py:103
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr ""
-#: ../cli.py:115
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr ""
-#: ../cli.py:126
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr ""
-#: ../cli.py:183 ../utils.py:72
+#: ../cli.py:192 ../utils.py:107
#, fuzzy, python-format
msgid "Config Error: %s"
msgstr "Ошибка опции: %s"
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Ошибка опции: %s"
-#: ../cli.py:229
+#: ../cli.py:223
+#, python-format
+msgid " Installed: %s-%s at %s"
+msgstr ""
+
+#: ../cli.py:225
+#, fuzzy, python-format
+msgid " Built : %s at %s"
+msgstr "Репозиторий: %s"
+
+#: ../cli.py:227
+#, fuzzy, python-format
+msgid " Committed: %s at %s"
+msgstr "Имя : %s"
+
+#: ../cli.py:266
#, fuzzy
msgid "You need to give some command"
msgstr "Hеобходимы привилегии суперпользователя для выполнения этой команды"
-#: ../cli.py:271
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr ""
-#: ../cli.py:273
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr ""
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:278
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
msgstr ""
-#: ../cli.py:317
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
-#: ../cli.py:347
+#: ../cli.py:395
#, fuzzy
msgid "Exiting on user Command"
msgstr "Выход по требованию пользователя"
-#: ../cli.py:351
+#: ../cli.py:399
#, fuzzy
msgid "Downloading Packages:"
msgstr "Поиск обновленных пакетов"
-#: ../cli.py:356
+#: ../cli.py:404
#, fuzzy
msgid "Error Downloading Packages:\n"
msgstr "Ошибка: Не подписанный пакет %s"
-#: ../cli.py:370 ../yum/__init__.py:2746
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr ""
-#: ../cli.py:373 ../yum/__init__.py:2749
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
-#: ../cli.py:377 ../yum/__init__.py:2751
-msgid "Please report this error in bugzilla"
+#: ../cli.py:435
+msgid "RPM needs to be updated"
msgstr ""
-#: ../cli.py:383
+#: ../cli.py:436
+#, python-format
+msgid "Please report this error in %s"
+msgstr ""
+
+#: ../cli.py:442
#, fuzzy
msgid "Running Transaction Test"
msgstr "Неизвестная ошибка в тестой транзакции:"
-#: ../cli.py:399
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr ""
-#: ../cli.py:401
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr ""
-#: ../cli.py:408
+#: ../cli.py:467
#, fuzzy
msgid "Transaction Test Succeeded"
msgstr "Транзакция Завершена"
-#: ../cli.py:429
+#: ../cli.py:489
msgid "Running Transaction"
msgstr ""
-#: ../cli.py:459
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-#: ../cli.py:491
-#, fuzzy
-msgid "Parsing package install arguments"
-msgstr "Ошибка при разборе параметров командной строки: %s"
+#: ../cli.py:538 ../cli.py:572
+msgid " * Maybe you meant: "
+msgstr ""
-#: ../cli.py:501
+#: ../cli.py:555 ../cli.py:563
#, fuzzy, python-format
-msgid "No package %s available."
+msgid "Package(s) %s%s%s available, but not installed."
msgstr "Нет доступных для просмотра пакетов"
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
+#, fuzzy, python-format
+msgid "No package %s%s%s available."
+msgstr "Нет доступных для просмотра пакетов"
+
+#: ../cli.py:605 ../cli.py:738
#, fuzzy
msgid "Package(s) to install"
msgstr "Нет доступных для просмотра пакетов"
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr ""
-#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
-#: ../yum/__init__.py:2340
-#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr ""
-
-#: ../cli.py:568
-#, fuzzy, python-format
-msgid "Could not find update match for %s"
-msgstr "Hе удается найти пакет совпадающий с %s"
-
-#: ../cli.py:580
+#: ../cli.py:639
#, fuzzy, python-format
msgid "%d packages marked for Update"
msgstr "Нет пакетов доступных для обновления"
-#: ../cli.py:583
+#: ../cli.py:642
#, fuzzy
msgid "No Packages marked for Update"
msgstr "Нет пакетов доступных для обновления"
-#: ../cli.py:599
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr ""
-#: ../cli.py:602
+#: ../cli.py:659
#, fuzzy
msgid "No Packages marked for removal"
msgstr "Нет пакетов доступных для обновления"
-#: ../cli.py:614
+#: ../cli.py:683
#, fuzzy
-msgid "No Packages Provided"
-msgstr "Пакеты не найдены"
+msgid "Package(s) to downgrade"
+msgstr "Нет доступных для просмотра пакетов"
-#: ../cli.py:654
-msgid "Matching packages for package list to user args"
+#: ../cli.py:707
+#, python-format
+msgid " (from %s)"
msgstr ""
-#: ../cli.py:701
+#: ../cli.py:709
+#, fuzzy, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Нет доступных для просмотра пакетов"
+
+#: ../cli.py:716
+#, fuzzy
+msgid "Package(s) to reinstall"
+msgstr "Нет доступных для просмотра пакетов"
+
+#: ../cli.py:729
+#, fuzzy
+msgid "No Packages Provided"
+msgstr "Пакеты не найдены"
+
+#: ../cli.py:813
#, fuzzy, python-format
msgid "Warning: No matches found for: %s"
msgstr "Удалить: Нет совпадений с %s"
-#: ../cli.py:704
+#: ../cli.py:816
#, fuzzy
msgid "No Matches found"
msgstr "Пакеты не найдены"
-#: ../cli.py:745
+#: ../cli.py:855
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+
+#: ../cli.py:871
#, fuzzy, python-format
msgid "No Package Found for %s"
msgstr "Пакет %s не найден"
-#: ../cli.py:757
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr ""
-#: ../cli.py:771
+#: ../cli.py:897
#, fuzzy
msgid "Cleaning up Headers"
msgstr "Удаление старых заголовков"
-#: ../cli.py:774
+#: ../cli.py:900
#, fuzzy
msgid "Cleaning up Packages"
msgstr "Удаление пакетов"
-#: ../cli.py:777
+#: ../cli.py:903
#, fuzzy
msgid "Cleaning up xml metadata"
msgstr "Получение групп с серверов"
-#: ../cli.py:780
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr ""
-#: ../cli.py:783
+#: ../cli.py:909
#, fuzzy
msgid "Cleaning up expire-cache metadata"
msgstr "Получение групп с серверов"
-#: ../cli.py:786
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr ""
-#: ../cli.py:807
+#: ../cli.py:937
#, fuzzy
msgid "Installed Groups:"
msgstr "Установлено: "
-#: ../cli.py:814
+#: ../cli.py:949
msgid "Available Groups:"
msgstr ""
-#: ../cli.py:820
+#: ../cli.py:959
msgid "Done"
msgstr ""
-#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, fuzzy, python-format
msgid "Warning: Group %s does not exist."
msgstr "Группа %s не существует"
-#: ../cli.py:853
+#: ../cli.py:998
#, fuzzy
msgid "No packages in any requested group available to install or update"
msgstr "Нет доступных для просмотра пакетов"
-#: ../cli.py:855
+#: ../cli.py:1000
#, fuzzy, python-format
msgid "%d Package(s) to Install"
msgstr "Нет доступных для просмотра пакетов"
-#: ../cli.py:865
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr ""
-#: ../cli.py:871
+#: ../cli.py:1016
#, fuzzy
msgid "No packages to remove from groups"
msgstr "Пакеты не найдены"
-#: ../cli.py:873
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr ""
-#: ../cli.py:915
+#: ../cli.py:1060
#, fuzzy, python-format
msgid "Package %s is already installed, skipping"
msgstr "%s уже установлен и это последняя версия."
-#: ../cli.py:926
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr ""
#. we've not got any installed that match n or n+a
-#: ../cli.py:952
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
-#: ../cli.py:971
+#: ../cli.py:1117
+msgid "Plugin Options"
+msgstr ""
+
+#: ../cli.py:1125
#, fuzzy, python-format
msgid "Command line error: %s"
msgstr "Ошибка опции: %s"
-#: ../cli.py:1101
+#: ../cli.py:1138
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+
+#: ../cli.py:1191
+msgid "--color takes one of: auto, always, never"
+msgstr ""
+
+#: ../cli.py:1298
+msgid "show this help message and exit"
+msgstr ""
+
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr ""
-#: ../cli.py:1103
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr ""
-#: ../cli.py:1105
+#: ../cli.py:1306
msgid "config file location"
msgstr ""
-#: ../cli.py:1107
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr ""
-#: ../cli.py:1109
+#: ../cli.py:1310
msgid "debugging output level"
msgstr ""
-#: ../cli.py:1113
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
-#: ../cli.py:1115
+#: ../cli.py:1316
msgid "error output level"
msgstr ""
-#: ../cli.py:1118
+#: ../cli.py:1319
msgid "quiet operation"
msgstr ""
-#: ../cli.py:1122
+#: ../cli.py:1321
+msgid "verbose operation"
+msgstr ""
+
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr ""
-#: ../cli.py:1124
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr ""
-#: ../cli.py:1125
+#: ../cli.py:1326
msgid "set install root"
msgstr ""
-#: ../cli.py:1129
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1133
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1136
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr ""
-#: ../cli.py:1138
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr ""
-#: ../cli.py:1141
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr ""
-#: ../cli.py:1143
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr ""
-#: ../cli.py:1145
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr ""
-#: ../cli.py:1147
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr ""
-#: ../cli.py:1150
+#: ../cli.py:1351
+msgid "enable plugins by name"
+msgstr ""
+
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr ""
-#: ../output.py:229
+#: ../cli.py:1356
+msgid "control whether color is used"
+msgstr ""
+
+#: ../output.py:305
msgid "Jan"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Feb"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Mar"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Apr"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "May"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Jun"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Jul"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Aug"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Sep"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Oct"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Nov"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Dec"
msgstr ""
-#: ../output.py:240
+#: ../output.py:316
msgid "Trying other mirror."
msgstr ""
-#: ../output.py:293
+#: ../output.py:538
#, fuzzy, python-format
-msgid "Name : %s"
+msgid "Name : %s%s%s"
msgstr "Имя : %s"
-#: ../output.py:294
+#: ../output.py:539
#, fuzzy, python-format
msgid "Arch : %s"
msgstr "Арх. : %s"
-#: ../output.py:296
+#: ../output.py:541
#, fuzzy, python-format
msgid "Epoch : %s"
msgstr "Репозиторий: %s"
-#: ../output.py:297
+#: ../output.py:542
#, fuzzy, python-format
msgid "Version : %s"
msgstr "Версия : %s"
-#: ../output.py:298
+#: ../output.py:543
#, fuzzy, python-format
msgid "Release : %s"
msgstr "Релиз : %s"
-#: ../output.py:299
+#: ../output.py:544
#, fuzzy, python-format
msgid "Size : %s"
msgstr "Размер: %s"
-#: ../output.py:300
+#: ../output.py:545
#, fuzzy, python-format
msgid "Repo : %s"
msgstr "Репозиторий: %s"
-#: ../output.py:302
+#: ../output.py:547
+#, fuzzy, python-format
+msgid "From repo : %s"
+msgstr "Версия : %s"
+
+#: ../output.py:549
#, fuzzy, python-format
msgid "Committer : %s"
msgstr "Имя : %s"
-#: ../output.py:303
+#: ../output.py:550
+#, fuzzy, python-format
+msgid "Committime : %s"
+msgstr "Имя : %s"
+
+#: ../output.py:551
+#, fuzzy, python-format
+msgid "Buildtime : %s"
+msgstr "Имя : %s"
+
+#: ../output.py:553
+#, fuzzy, python-format
+msgid "Installtime: %s"
+msgstr "[установить: %s]"
+
+#: ../output.py:554
#, fuzzy
msgid "Summary : "
msgstr "Описание: %s"
-#: ../output.py:305
+#: ../output.py:556
#, fuzzy, python-format
msgid "URL : %s"
msgstr "Репозиторий: %s"
-#: ../output.py:306
+#: ../output.py:557
#, fuzzy, python-format
msgid "License : %s"
msgstr "Размер: %s"
-#: ../output.py:307
+#: ../output.py:558
#, fuzzy
msgid "Description: "
msgstr ""
"Описание:\n"
" %s"
-#: ../output.py:351
-msgid "Is this ok [y/N]: "
-msgstr "Выполнить [y/N]: "
-
-#: ../output.py:357 ../output.py:360
+#: ../output.py:626
msgid "y"
msgstr ""
-#: ../output.py:357
-msgid "n"
+#: ../output.py:626
+msgid "yes"
msgstr ""
-#: ../output.py:357 ../output.py:360
-msgid "yes"
+#: ../output.py:627
+msgid "n"
msgstr ""
-#: ../output.py:357
+#: ../output.py:627
msgid "no"
msgstr ""
-#: ../output.py:367
+#: ../output.py:631
+msgid "Is this ok [y/N]: "
+msgstr "Выполнить [y/N]: "
+
+#: ../output.py:722
#, fuzzy, python-format
msgid ""
"\n"
"Group: %s"
msgstr "Группа: %s"
-#: ../output.py:369
+#: ../output.py:726
+#, fuzzy, python-format
+msgid " Group-Id: %s"
+msgstr "Группа: %s"
+
+#: ../output.py:731
#, fuzzy, python-format
msgid " Description: %s"
msgstr ""
"Описание:\n"
" %s"
-#: ../output.py:371
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr ""
-#: ../output.py:376
+#: ../output.py:734
#, fuzzy
msgid " Default Packages:"
msgstr "Удаление пакетов"
-#: ../output.py:381
+#: ../output.py:735
#, fuzzy
msgid " Optional Packages:"
msgstr "Поиск обновленных пакетов"
-#: ../output.py:386
+#: ../output.py:736
#, fuzzy
msgid " Conditional Packages:"
msgstr "Поиск обновленных пакетов"
-#: ../output.py:394
+#: ../output.py:756
#, fuzzy, python-format
msgid "package: %s"
msgstr "Удаление пакетов"
-#: ../output.py:396
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr ""
-#: ../output.py:401
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr ""
-#: ../output.py:403
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr ""
-#: ../output.py:461
+#: ../output.py:837
+#, fuzzy, python-format
+msgid "Repo : %s"
+msgstr "Репозиторий: %s"
+
+#: ../output.py:838
#, fuzzy
msgid "Matched from:"
msgstr "Пакеты не найдены"
-#: ../output.py:487
+#: ../output.py:847
+#, fuzzy
+msgid "Description : "
+msgstr ""
+"Описание:\n"
+" %s"
+
+#: ../output.py:850
+#, fuzzy, python-format
+msgid "URL : %s"
+msgstr "Репозиторий: %s"
+
+#: ../output.py:853
+#, fuzzy, python-format
+msgid "License : %s"
+msgstr "Размер: %s"
+
+#: ../output.py:856
+#, fuzzy, python-format
+msgid "Filename : %s"
+msgstr "Релиз : %s"
+
+#: ../output.py:860
+#, fuzzy
+msgid "Other : "
+msgstr "Имя : %s"
+
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr ""
-#: ../output.py:492
+#: ../output.py:898
#, fuzzy, python-format
msgid "Total size: %s"
msgstr "Не обычный файл: %s"
-#: ../output.py:495
+#: ../output.py:901
#, fuzzy, python-format
msgid "Total download size: %s"
msgstr "Не обычный файл: %s"
-#: ../output.py:507
-msgid "Package"
-msgstr ""
-
-#: ../output.py:507
-msgid "Arch"
-msgstr "Арх."
-
-#: ../output.py:507
-msgid "Version"
-msgstr "Версия"
-
-#: ../output.py:507
-msgid "Repository"
-msgstr ""
+#: ../output.py:942
+#, fuzzy
+msgid "Reinstalling"
+msgstr "Ошибки установки:"
-#: ../output.py:507
-msgid "Size"
+#: ../output.py:943
+msgid "Downgrading"
msgstr ""
-#: ../output.py:514
+#: ../output.py:944
#, fuzzy
msgid "Installing for dependencies"
msgstr "Разрешение зависимостей"
-#: ../output.py:515
+#: ../output.py:945
#, fuzzy
msgid "Updating for dependencies"
msgstr "Разрешение зависимостей"
-#: ../output.py:516
+#: ../output.py:946
#, fuzzy
msgid "Removing for dependencies"
msgstr "Разрешение зависимостей"
-#: ../output.py:528
+#: ../output.py:953 ../output.py:1065
+msgid "Skipped (dependency problems)"
+msgstr ""
+
+#: ../output.py:976
+msgid "Package"
+msgstr ""
+
+#: ../output.py:976
+msgid "Arch"
+msgstr "Арх."
+
+#: ../output.py:977
+msgid "Version"
+msgstr "Версия"
+
+#: ../output.py:977
+msgid "Repository"
+msgstr ""
+
+#: ../output.py:978
+msgid "Size"
+msgstr ""
+
+#: ../output.py:990
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-#: ../output.py:536
+#: ../output.py:999
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
-"=============================================================================\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
+"%s\n"
msgstr ""
-#: ../output.py:554
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr ""
-#: ../output.py:555
+#: ../output.py:1060
#, fuzzy
msgid "Dependency Removed"
msgstr "Зависимости разрешены"
-#: ../output.py:557
+#: ../output.py:1062
#, fuzzy
msgid "Dependency Installed"
msgstr "Установлено по зависимостям: "
-#: ../output.py:559
+#: ../output.py:1064
#, fuzzy
msgid "Dependency Updated"
msgstr "Зависимости разрешены"
-#: ../output.py:560
+#: ../output.py:1066
msgid "Replaced"
msgstr ""
-#: ../output.py:618
+#: ../output.py:1067
+#, fuzzy
+msgid "Failed"
+msgstr "Установлено по зависимостям: "
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1133
+msgid "two"
+msgstr ""
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
-#: ../output.py:628
+#: ../output.py:1155
msgid "user interrupt"
msgstr ""
-#: ../output.py:639
+#: ../output.py:1173
+msgid "Total"
+msgstr ""
+
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Неизвестная ошибка в тестой транзакции:"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Транзакция Завершена"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Имя : %s"
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "Репозиторий: %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+msgid "Aborted"
+msgstr ""
+
+#: ../output.py:1389
+msgid "Failure:"
+msgstr ""
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+msgid "Transaction performed with:"
+msgstr ""
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Пакеты не найдены"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "ВВОшибка: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
#, fuzzy
msgid "installed"
msgstr "Установлено по зависимостям: "
-#: ../output.py:640
+#: ../output.py:1525
#, fuzzy
msgid "updated"
msgstr "Обновлено: "
-#: ../output.py:641
+#: ../output.py:1526
msgid "obsoleted"
msgstr ""
-#: ../output.py:642
+#: ../output.py:1527
#, fuzzy
msgid "erased"
msgstr "Удалено: "
-#: ../output.py:646
+#: ../output.py:1531
#, fuzzy, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr ""
"Установленный пакет: %s.%s %s:%s-%s предоставляет\n"
" %s"
-#: ../output.py:653
+#: ../output.py:1538
#, fuzzy
msgid "--> Running transaction check"
msgstr "Неизвестная ошибка в тестой транзакции:"
-#: ../output.py:658
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr ""
-#: ../output.py:663
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr ""
-#: ../output.py:668
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr ""
-#: ../output.py:673
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr ""
-#: ../output.py:679
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr ""
-#: ../output.py:682
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
-#: ../output.py:686
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
-#: ../yumcommands.py:36
+#: ../utils.py:137 ../yummain.py:42
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr "Выход по требованию пользователя"
+
+#: ../utils.py:143 ../yummain.py:48
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr "Выход по требованию пользователя"
+
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr ""
+
+#: ../yumcommands.py:42
#, fuzzy
msgid "You need to be root to perform this command."
msgstr "Hеобходимы привилегии суперпользователя для выполнения этой команды"
-#: ../yumcommands.py:43
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -807,344 +1152,528 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
-#: ../yumcommands.py:63
+#: ../yumcommands.py:69
#, fuzzy, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Необходимо указать список пакетов для установки"
-#: ../yumcommands.py:69
+#: ../yumcommands.py:75
#, fuzzy
msgid "Error: Need an item to match"
msgstr "Необходим параметр для поиска"
-#: ../yumcommands.py:75
+#: ../yumcommands.py:81
#, fuzzy
msgid "Error: Need a group or list of groups"
msgstr "Необходимо указать список пакетов для установки"
-#: ../yumcommands.py:84
+#: ../yumcommands.py:90
#, fuzzy, python-format
msgid "Error: clean requires an option: %s"
msgstr "Ошибка создания каталога %s: %s"
-#: ../yumcommands.py:89
+#: ../yumcommands.py:95
#, fuzzy, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Ошибка при разборе параметров командной строки: %s"
-#: ../yumcommands.py:102
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr ""
-#: ../yumcommands.py:105
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr ""
-#: ../yumcommands.py:109
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
-#: ../yumcommands.py:115
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
-#: ../yumcommands.py:156
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr ""
-#: ../yumcommands.py:159
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:168
+#: ../yumcommands.py:180
#, fuzzy
msgid "Setting up Install Process"
msgstr "Просмотр установленных пакетов:"
-#: ../yumcommands.py:179
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr ""
-#: ../yumcommands.py:182
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:190
+#: ../yumcommands.py:201
#, fuzzy
msgid "Setting up Update Process"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:204
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr ""
-#: ../yumcommands.py:212
+#: ../yumcommands.py:295
#, fuzzy
msgid "Installed Packages"
msgstr "Просмотр установленных пакетов:"
-#: ../yumcommands.py:213
+#: ../yumcommands.py:303
#, fuzzy
msgid "Available Packages"
msgstr "Просмотр доступных пакетов"
-#: ../yumcommands.py:214
+#: ../yumcommands.py:307
#, fuzzy
msgid "Extra Packages"
msgstr "Поиск обновленных пакетов"
-#: ../yumcommands.py:215
+#: ../yumcommands.py:311
#, fuzzy
msgid "Updated Packages"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:221 ../yumcommands.py:225
+#. This only happens in verbose mode
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
#, fuzzy
msgid "Obsoleting Packages"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:226
+#: ../yumcommands.py:328
#, fuzzy
msgid "Recently Added Packages"
msgstr "Поиск обновленных пакетов"
-#: ../yumcommands.py:232
+#: ../yumcommands.py:335
#, fuzzy
msgid "No matching Packages to list"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:246
+#: ../yumcommands.py:349
#, fuzzy
msgid "List a package or groups of packages"
msgstr "Поиск пакета среди установленных пакетов"
-#: ../yumcommands.py:258
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr ""
-#: ../yumcommands.py:266
+#: ../yumcommands.py:368
#, fuzzy
msgid "Setting up Remove Process"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:278
+#: ../yumcommands.py:382
#, fuzzy
msgid "Setting up Group Process"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:284
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr ""
-#: ../yumcommands.py:297
+#: ../yumcommands.py:401
#, fuzzy
msgid "List available package groups"
msgstr "Просмотр доступных пакетов"
-#: ../yumcommands.py:314
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr ""
-#: ../yumcommands.py:336
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr ""
-#: ../yumcommands.py:360
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr ""
-#: ../yumcommands.py:384
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr ""
-#: ../yumcommands.py:390
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr ""
-#: ../yumcommands.py:391
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
-#: ../yumcommands.py:412
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr ""
-#: ../yumcommands.py:426
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr ""
-#: ../yumcommands.py:447
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr ""
-#: ../yumcommands.py:467
+#: ../yumcommands.py:573
#, fuzzy
msgid "Check for available package updates"
msgstr "Удаление записи из списка доступных пакетов"
-#: ../yumcommands.py:490
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr ""
-#: ../yumcommands.py:496
+#: ../yumcommands.py:629
#, fuzzy
msgid "Searching Packages: "
msgstr "Удаление пакетов"
-#: ../yumcommands.py:513
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr ""
-#: ../yumcommands.py:522
+#: ../yumcommands.py:654
#, fuzzy
msgid "Setting up Upgrade Process"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:536
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr ""
-#: ../yumcommands.py:545
+#: ../yumcommands.py:676
#, fuzzy
msgid "Setting up Local Package Process"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:564
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr ""
-#: ../yumcommands.py:567
+#: ../yumcommands.py:698
#, fuzzy
msgid "Searching Packages for Dependency:"
msgstr "Удаление пакетов"
-#: ../yumcommands.py:581
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr ""
-#: ../yumcommands.py:587
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr ""
-#: ../yumcommands.py:605
+#: ../yumcommands.py:736
#, fuzzy
msgid "List a package's dependencies"
msgstr "Разрешение зависимостей"
-#: ../yumcommands.py:611
+#: ../yumcommands.py:742
#, fuzzy
msgid "Finding dependencies: "
msgstr "Разрешение зависимостей"
-#: ../yumcommands.py:627
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo id"
+#: ../yumcommands.py:810 ../yumcommands.py:811
+#, fuzzy
+msgid "enabled"
+msgstr "Установлено по зависимостям: "
+
+#: ../yumcommands.py:819 ../yumcommands.py:820
+#, fuzzy
+msgid "disabled"
+msgstr "Установлено по зависимостям: "
+
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
+msgstr "Репозиторий: %s"
+
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
+msgstr "Релиз : %s"
+
+#: ../yumcommands.py:836
+msgid "Repo-status : "
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo name"
+#: ../yumcommands.py:838
+msgid "Repo-revision: "
msgstr ""
-#: ../yumcommands.py:645
-msgid "status"
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
+msgstr "Релиз : %s"
+
+#: ../yumcommands.py:848
+msgid "Repo-distro-tags: "
msgstr ""
-#: ../yumcommands.py:651
+#: ../yumcommands.py:853
#, fuzzy
-msgid "enabled"
-msgstr "Установлено по зависимостям: "
+msgid "Repo-updated : "
+msgstr "Обновлено: "
-#: ../yumcommands.py:654
+#: ../yumcommands.py:855
#, fuzzy
-msgid "disabled"
-msgstr "Установлено по зависимостям: "
+msgid "Repo-pkgs : "
+msgstr "Репозиторий: %s"
+
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
+msgstr "Релиз : %s"
+
+#: ../yumcommands.py:863
+msgid "Repo-baseurl : "
+msgstr ""
+
+#: ../yumcommands.py:871
+msgid "Repo-metalink: "
+msgstr ""
+
+#: ../yumcommands.py:875
+#, fuzzy
+msgid " Updated : "
+msgstr "Обновлено: "
-#: ../yumcommands.py:671
+#: ../yumcommands.py:878
+msgid "Repo-mirrors : "
+msgstr ""
+
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr ""
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, python-format
+msgid "Instant (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:893
+#, fuzzy, python-format
+msgid "%s second(s) (last: %s)"
+msgstr "зависимости: пакет %s конфликтует с %s"
+
+#: ../yumcommands.py:895
+msgid "Repo-expire : "
+msgstr ""
+
+#: ../yumcommands.py:898
+msgid "Repo-exclude : "
+msgstr ""
+
+#: ../yumcommands.py:902
+msgid "Repo-include : "
+msgstr ""
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:912 ../yumcommands.py:938
+msgid "repo id"
+msgstr ""
+
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
+msgid "status"
+msgstr ""
+
+#: ../yumcommands.py:939
+msgid "repo name"
+msgstr ""
+
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr ""
-#: ../yumcommands.py:705
+#: ../yumcommands.py:999
#, fuzzy, python-format
msgid "No help available for %s"
msgstr "Нет доступных для просмотра пакетов"
-#: ../yumcommands.py:710
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
"aliases: "
msgstr ""
-#: ../yumcommands.py:712
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
"alias: "
msgstr ""
-#: ../yumcommands.py:741
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr ""
-#: ../yumcommands.py:755
+#: ../yumcommands.py:1042
#, fuzzy
msgid "reinstall a package"
msgstr "Удаление пакетов"
-#: ../yummain.py:41
+#: ../yumcommands.py:1060
#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
-msgstr "Выход по требованию пользователя"
+msgid "Setting up Downgrade Process"
+msgstr "Удаление пакетов"
-#: ../yummain.py:47
+#: ../yumcommands.py:1067
#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
-msgstr "Выход по требованию пользователя"
+msgid "downgrade a package"
+msgstr "Удаление пакетов"
+
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
+msgstr ""
+
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr "Группа: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Поиск обновленных пакетов"
+
+#: ../yumcommands.py:1152
+#, fuzzy
+msgid "Installed:"
+msgstr "Установлено по зависимостям: "
+
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Установлено по зависимостям: "
+
+#: ../yumcommands.py:1166
+#, fuzzy
+msgid "Available:"
+msgstr "Просмотр доступных пакетов"
+
+#: ../yumcommands.py:1172
+msgid "Group-Available:"
+msgstr ""
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
+
+#: ../yummain.py:128
+msgid "Running"
+msgstr ""
+
+#: ../yummain.py:129
+msgid "Sleeping"
+msgstr ""
+
+#: ../yummain.py:130
+msgid "Uninteruptable"
+msgstr ""
+
+#: ../yummain.py:131
+msgid "Zombie"
+msgstr ""
+
+#: ../yummain.py:132
+msgid "Traced/Stopped"
+msgstr ""
+
+#: ../yummain.py:137
+msgid " The other application is: PackageKit"
+msgstr ""
+
+#: ../yummain.py:139
+#, python-format
+msgid " The other application is: %s"
+msgstr ""
+
+#: ../yummain.py:142
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr ""
+
+#: ../yummain.py:146
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr ""
+
+#: ../yummain.py:148
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr ""
-#: ../yummain.py:105
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
-#: ../yummain.py:132 ../yummain.py:171
+#: ../yummain.py:201 ../yummain.py:240
#, fuzzy, python-format
msgid "Error: %s"
msgstr "ВВОшибка: %s"
-#: ../yummain.py:142 ../yummain.py:178
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr ""
#. Depsolve stage
-#: ../yummain.py:149
+#: ../yummain.py:218
#, fuzzy
msgid "Resolving Dependencies"
msgstr "Разрешение зависимостей"
-#: ../yummain.py:184
+#: ../yummain.py:242
+msgid " You could try using --skip-broken to work around the problem"
+msgstr ""
+
+#: ../yummain.py:243
+msgid ""
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
+msgstr ""
+
+#: ../yummain.py:259
#, fuzzy
msgid ""
"\n"
"Dependencies Resolved"
msgstr "Зависимости разрешены"
-#: ../yummain.py:198
-msgid "Complete!"
-msgstr ""
-
-#: ../yummain.py:245
+#: ../yummain.py:326
#, fuzzy
msgid ""
"\n"
@@ -1156,689 +1685,743 @@ msgstr "Выход по требованию пользователя"
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/depsolve.py:95
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr ""
-#: ../yum/depsolve.py:136
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr ""
-#: ../yum/depsolve.py:147
+#: ../yum/depsolve.py:159
#, fuzzy, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Удаление пакетов"
-#: ../yum/depsolve.py:170
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr ""
-#: ../yum/depsolve.py:178
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr ""
-#: ../yum/depsolve.py:219
+#: ../yum/depsolve.py:224
#, fuzzy, python-format
msgid "Member: %s"
msgstr "Сервер: %s"
-#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr ""
-#: ../yum/depsolve.py:240
+#: ../yum/depsolve.py:245
#, fuzzy, python-format
msgid "Adding Package %s in mode %s"
msgstr "Нет пакета %s, %s"
-#: ../yum/depsolve.py:250
+#: ../yum/depsolve.py:255
#, fuzzy, python-format
msgid "Removing Package %s"
msgstr "Поиск обновленных пакетов"
-#: ../yum/depsolve.py:261
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr ""
-#: ../yum/depsolve.py:312
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr ""
-#: ../yum/depsolve.py:322
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr ""
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr ""
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr ""
-#: ../yum/depsolve.py:356
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr ""
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr ""
-#: ../yum/depsolve.py:372
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:407
#, fuzzy, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Hе удается найти пакет совпадающий с %s"
-#: ../yum/depsolve.py:388
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr ""
+#: ../yum/depsolve.py:440
+#, python-format
+msgid "Quick matched %s to require for %s"
+msgstr ""
+
#. is it already installed?
-#: ../yum/depsolve.py:434
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
-#: ../yum/depsolve.py:449
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
-#: ../yum/depsolve.py:460
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
-#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr ""
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr ""
-#: ../yum/depsolve.py:510
-#, python-format
-msgid ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr ""
-
-#: ../yum/depsolve.py:537
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr ""
-#: ../yum/depsolve.py:544
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr ""
-#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr ""
-#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr ""
-#: ../yum/depsolve.py:702
+#: ../yum/depsolve.py:755
#, fuzzy
msgid "Dependency Process ending"
msgstr "Зависимости разрешены"
-#: ../yum/depsolve.py:708
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr ""
-#: ../yum/depsolve.py:715
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr ""
-#: ../yum/depsolve.py:729
+#: ../yum/depsolve.py:782
#, fuzzy, python-format
msgid "Checking deps for %s"
msgstr ""
"\n"
"Проверка сигнатуры %s"
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr ""
-#: ../yum/depsolve.py:933
-#, python-format
-msgid "Comparing best: %s to po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:937
-#, python-format
-msgid "Same: best %s == po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
-#, python-format
-msgid "best %s obsoletes po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:955
+#: ../yum/depsolve.py:1007
#, python-format
-msgid "po %s obsoletes best: %s"
+msgid "Running compare_providers() for %s"
msgstr ""
-#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, fuzzy, python-format
msgid "better arch in po %s"
msgstr "Удаление пакетов"
-#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
-#, python-format
-msgid "po %s shares a sourcerpm with %s"
-msgstr ""
+#: ../yum/depsolve.py:1142
+#, fuzzy, python-format
+msgid "%s obsoletes %s"
+msgstr "зависимости: пакет %s конфликтует с %s"
-#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:1154
#, python-format
-msgid "best %s shares a sourcerpm with %s"
+msgid ""
+"archdist compared %s to %s on %s\n"
+" Winner: %s"
msgstr ""
-#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:1161
#, python-format
-msgid "po %s shares more of the name prefix with %s"
+msgid "common sourcerpm %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1167
#, python-format
-msgid "po %s has a shorter name than best %s"
+msgid "common prefix of %s between %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1175
#, python-format
-msgid "bestpkg %s shares more of the name prefix with %s"
+msgid "Best Order: %s"
msgstr ""
-#: ../yum/__init__.py:119
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:296
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr ""
-#: ../yum/__init__.py:332
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr ""
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:349
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr ""
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:387
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:404
+#: ../yum/__init__.py:539
#, fuzzy
msgid "Setting up Package Sacks"
msgstr "Удаление пакетов"
-#: ../yum/__init__.py:447
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr ""
-#: ../yum/__init__.py:448
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr ""
-#: ../yum/__init__.py:453
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:465
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr ""
-#: ../yum/__init__.py:496
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:520
+#: ../yum/__init__.py:662
#, fuzzy
msgid "Getting group metadata"
msgstr "Получение групп с серверов"
-#: ../yum/__init__.py:546
+#: ../yum/__init__.py:688
#, fuzzy, python-format
msgid "Adding group file from repository: %s"
msgstr "получение групп с сервера: %s"
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr ""
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr ""
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr ""
-#: ../yum/__init__.py:657
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr ""
-#: ../yum/__init__.py:680
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr ""
-#: ../yum/__init__.py:681
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
msgstr ""
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr ""
-#: ../yum/__init__.py:774
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+
+#: ../yum/__init__.py:1101
#, fuzzy, python-format
msgid "Failed to remove transaction file %s"
msgstr "Не найдена секция: %s"
-#: ../yum/__init__.py:814
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "excluding for cost: %s from %s"
+msgid "%s was supposed to be installed but is not!"
msgstr ""
-#: ../yum/__init__.py:845
-msgid "Excluding Packages in global exclude list"
-msgstr ""
-
-#: ../yum/__init__.py:847
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Excluding Packages from %s"
-msgstr ""
-
-#: ../yum/__init__.py:875
-#, fuzzy, python-format
-msgid "Reducing %s to included packages only"
-msgstr "Поиск устаревших пакетов"
-
-#: ../yum/__init__.py:880
-#, fuzzy, python-format
-msgid "Keeping included package %s"
-msgstr "Поиск обновленных пакетов"
-
-#: ../yum/__init__.py:886
-#, fuzzy, python-format
-msgid "Removing unmatched package %s"
-msgstr "Поиск обновленных пакетов"
-
-#: ../yum/__init__.py:889
-msgid "Finished"
+msgid "%s was supposed to be removed but is not!"
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:919
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Невозможно проверить активен ли процесс %s"
#. Another copy seems to be running.
-#: ../yum/__init__.py:923
+#: ../yum/__init__.py:1293
#, fuzzy, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Файл %s существует, другая копия yum запущена. Выход."
-#: ../yum/__init__.py:970 ../yum/__init__.py:977
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, fuzzy, python-format
+msgid "Could not create lock at %s: %s "
+msgstr "Hе удается найти пакет совпадающий с %s"
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr ""
-#: ../yum/__init__.py:991
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr ""
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr ""
-#: ../yum/__init__.py:1036
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr ""
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1477
#, python-format
-msgid "Insufficient space in download directory %s to download"
+msgid ""
+"Insufficient space in download directory %s\n"
+" * free %s\n"
+" * needed %s"
msgstr ""
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr ""
-#: ../yum/__init__.py:1134
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-#: ../yum/__init__.py:1189
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr ""
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1622
#, fuzzy, python-format
msgid "Problem opening package %s"
msgstr "Удаление пакетов"
-#: ../yum/__init__.py:1201
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr ""
-#: ../yum/__init__.py:1205
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr ""
-#: ../yum/__init__.py:1243
+#: ../yum/__init__.py:1672
#, fuzzy, python-format
msgid "Cannot remove %s"
msgstr "Невозможно удалить файл %s"
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr ""
-#: ../yum/__init__.py:1283
+#: ../yum/__init__.py:1712
#, fuzzy, python-format
msgid "Cannot remove %s file %s"
msgstr "Невозможно удалить файл %s"
-#: ../yum/__init__.py:1287
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr ""
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr ""
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: ../yum/__init__.py:1335
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr ""
-#: ../yum/__init__.py:1543
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:2065
#, fuzzy, python-format
msgid "Searching %d packages"
msgstr "Удаление пакетов"
-#: ../yum/__init__.py:1584
+#: ../yum/__init__.py:2069
#, fuzzy, python-format
msgid "searching package %s"
msgstr "Удаление пакетов"
-#: ../yum/__init__.py:1596
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr ""
-#: ../yum/__init__.py:1603
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr ""
-#: ../yum/__init__.py:1633
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr ""
-#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#: ../yum/__init__.py:2170
+msgid "No group data available for configured repositories"
+msgstr ""
+
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr ""
-#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr ""
-#: ../yum/__init__.py:1770
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr ""
-#: ../yum/__init__.py:1774
+#: ../yum/__init__.py:2283
#, fuzzy, python-format
msgid "No package named %s available to be installed"
msgstr "Нет доступных для просмотра пакетов"
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
-msgid "Invalid versioned dependency string, try quoting it."
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
#, fuzzy
msgid "Invalid version flag"
msgstr "Hеверная опция чистки %s"
-#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, fuzzy, python-format
msgid "No Package found for %s"
msgstr "Пакет %s не найден"
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr ""
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr ""
-#. only one in there
-#: ../yum/__init__.py:2085
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr ""
-#. FIXME - this is where we could check to see if it already installed
-#. for returning better errors
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2798
+#, fuzzy, python-format
+msgid "Package %s installed and not available"
+msgstr "%s уже установлен и это последняя версия."
+
+#: ../yum/__init__.py:2801
#, fuzzy
msgid "No package(s) available to install"
msgstr "Нет доступных для просмотра пакетов"
-#: ../yum/__init__.py:2158
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr ""
-#: ../yum/__init__.py:2171
+#: ../yum/__init__.py:2839
+#, fuzzy, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr "%s уже установлен и это последняя версия."
+
+#: ../yum/__init__.py:2842
+#, fuzzy, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr "%s уже установлен и это последняя версия."
+
+#: ../yum/__init__.py:2850
#, fuzzy, python-format
msgid "Package %s already installed and latest version"
msgstr "%s уже установлен и это последняя версия."
-#: ../yum/__init__.py:2178
+#: ../yum/__init__.py:2864
#, fuzzy, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "%s уже установлен и это последняя версия."
#. update everything (the easy case)
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:2304
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:2377
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr ""
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:3093
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Удаление пакетов"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, fuzzy, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Невозможно удалить файл %s"
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, fuzzy, python-format
msgid "Examining %s: %s"
msgstr "игнорируется src пакет: %s"
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-#: ../yum/__init__.py:2468
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, fuzzy, python-format
msgid "Excluding %s"
msgstr "добавление %s"
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr ""
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr ""
-#: ../yum/__init__.py:2486
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr ""
-#: ../yum/__init__.py:2504
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2515
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, fuzzy, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "%s уже установлен и это последняя версия."
-#: ../yum/__init__.py:2522
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, python-format
+msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:3515
+#, fuzzy
+msgid "No package(s) available to downgrade"
+msgstr "Нет доступных для просмотра пакетов"
+
+#: ../yum/__init__.py:3559
+#, fuzzy, python-format
+msgid "No Match for available package: %s"
+msgstr "Удаление записи из списка доступных пакетов"
+
+#: ../yum/__init__.py:3565
+#, fuzzy, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr "Удаление записи из списка доступных пакетов"
+
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Не обычный файл: %s"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr ""
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr ""
-#: ../yum/__init__.py:2589
-msgid "GPG key parsing failed: "
+#: ../yum/__init__.py:3735
+#, python-format
+msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
-#: ../yum/__init__.py:2593
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr ""
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr ""
-#: ../yum/__init__.py:2610
+#: ../yum/__init__.py:3789
#, fuzzy
msgid "Not installing key"
msgstr "Ошибки установки:"
-#: ../yum/__init__.py:2616
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr ""
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr ""
-#: ../yum/__init__.py:2624
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1846,107 +2429,149 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: ../yum/__init__.py:2633
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: ../yum/__init__.py:2707
+#: ../yum/__init__.py:3829
+#, python-format
+msgid "GPG key at %s (0x%s) is already imported"
+msgstr ""
+
+#: ../yum/__init__.py:3849
+#, fuzzy, python-format
+msgid "Not installing key for repo %s"
+msgstr "Ошибки установки:"
+
+#: ../yum/__init__.py:3854
+msgid "Key import failed"
+msgstr ""
+
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr ""
-#: ../yum/__init__.py:2709
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:2774
+#: ../yum/__init__.py:4028
+#, python-format
+msgid "Please report this error at %s"
+msgstr ""
+
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr ""
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:195
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr ""
-#: ../yum/plugins.py:206
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, fuzzy, python-format
msgid "No plugin match for: %s"
msgstr "Удалить: Нет совпадений с %s"
-#: ../yum/plugins.py:219
+#: ../yum/plugins.py:252
+#, python-format
+msgid "Not loading \"%s\" plugin, as it is disabled"
+msgstr ""
+
+#. Give full backtrace:
+#: ../yum/plugins.py:264
#, python-format
-msgid "\"%s\" plugin is disabled"
+msgid "Plugin \"%s\" can't be imported"
msgstr ""
-#: ../yum/plugins.py:231
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr ""
-#: ../yum/plugins.py:235
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr ""
-#: ../yum/plugins.py:264
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr ""
-#: ../yum/plugins.py:271
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr ""
-#: ../yum/plugins.py:291
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr ""
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:294
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr ""
-#: ../yum/plugins.py:448
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr ""
-#: ../rpmUtils/oldUtils.py:26
+#: ../yum/rpmtrans.py:78
+#, fuzzy
+msgid "Repackaging"
+msgstr "Удаление пакетов"
+
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr "Заголовок не открывается или не совпадает %s, %s."
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr "Ошибка проверки md5-суммы пакета %s "
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr ""
"Невозможно открыть базу RPM для чтения. Возможно база уже используется."
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr "Получен пустой заголовок, что-то не так"
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr "Плохой заголовок %s"
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Невозможно открыть пакет %s - ошибка %s"
#, fuzzy
-#~ msgid "%s conflicts: %s"
-#~ msgstr "зависимости: пакет %s конфликтует с %s"
+#~ msgid "Parsing package install arguments"
+#~ msgstr "Ошибка при разборе параметров командной строки: %s"
+
+#, fuzzy
+#~ msgid "Reducing %s to included packages only"
+#~ msgstr "Поиск устаревших пакетов"
+
+#, fuzzy
+#~ msgid "Keeping included package %s"
+#~ msgstr "Поиск обновленных пакетов"
+
+#, fuzzy
+#~ msgid "Removing unmatched package %s"
+#~ msgstr "Поиск обновленных пакетов"
#, fuzzy
#~ msgid "%s conflicts with %s"
@@ -2392,9 +3017,6 @@ msgstr "Невозможно открыть пакет %s - ошибка %s"
#~ msgid "Name"
#~ msgstr "Название"
-#~ msgid "[install: %s]"
-#~ msgstr "[установить: %s]"
-
#~ msgid "Downloading needed headers"
#~ msgstr "Получение необходимых заголовков"
diff --git a/po/sr.po b/po/sr.po
index 962ebcb..126cb2e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-01 19:44+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-04-01 21:06+0100\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../callback.py:48 ../output.py:933 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Ажурирам"
@@ -27,7 +27,7 @@ msgstr "Ажурирам"
msgid "Erasing"
msgstr "Бришем"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:932
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Инсталирам"
@@ -36,15 +36,16 @@ msgstr "Инсталирам"
msgid "Obsoleted"
msgstr "Превазиђени"
-#: ../callback.py:54 ../output.py:1040
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Ажурирани"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Обрисани"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1038
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Инсталирани"
@@ -66,7 +67,7 @@ msgstr "Грешка: погрешно излазно стање: %s за %s"
msgid "Erased: %s"
msgstr "Обрисано: %s"
-#: ../callback.py:217 ../output.py:934
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Уклањам"
@@ -74,60 +75,60 @@ msgstr "Уклањам"
msgid "Cleanup"
msgstr "Чишћење"
-#: ../cli.py:104
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Наредба „%s“ је већ дефинисана"
-#: ../cli.py:116
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Постављам ризнице"
-#: ../cli.py:127
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Читам метаподатке ризница из локалних датотека"
-#: ../cli.py:190 ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Грешка при подешавању: %s"
-#: ../cli.py:193 ../cli.py:1231 ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Грешка у опцијама: %s"
-#: ../cli.py:221
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Инсталиран : %s-%s %s"
-#: ../cli.py:223
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Направио/ла: %s %s"
-#: ../cli.py:225
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Објавио/ла : %s %s"
-#: ../cli.py:264
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Морате да унесете неку команду"
-#: ../cli.py:307
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Захтеви диска:\n"
-#: ../cli.py:309
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Потребно је најмање %dМБ на %s систему датотека.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:314
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -135,56 +136,64 @@ msgstr ""
"Сажетак грешака\n"
"-------------\n"
-#: ../cli.py:357
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Покушавам да извршим трансакцију али нема шта да се ради. Излазим."
-#: ../cli.py:393
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Излазим на команду корисника"
-#: ../cli.py:397
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Преузимам пакете:"
-#: ../cli.py:402
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Грешка при преузимању пакета:\n"
-#: ../cli.py:416 ../yum/__init__.py:3528
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Извршавам rpm_check_debug"
-#: ../cli.py:419 ../yum/__init__.py:3531
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "ГРЕШКА са rpm_check_debug у односу на depsolve:"
-#: ../cli.py:423
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Пријавите ову грешку у %s"
-#: ../cli.py:429
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Извршавам проверу трансакције"
-#: ../cli.py:445
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Завршена је провера трансакције"
-#: ../cli.py:447
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Грешка при провери трансакције:\n"
-#: ../cli.py:454
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Провера трансакције је успела"
-#: ../cli.py:475
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Извршавам трансакцију"
-#: ../cli.py:505
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -192,69 +201,79 @@ msgstr ""
"Одбијам да аутоматски увезем кључеве када се извршавање не надгледа.\n"
"За превазилажење овога користите „-y“."
-#: ../cli.py:524 ../cli.py:558
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Можда сте мислили: "
-#: ../cli.py:541 ../cli.py:549
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "%s%s%s пакет је доступан, али није инсталиран."
-#: ../cli.py:555 ../cli.py:586 ../cli.py:666
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Не постоји доступан пакет %s%s%s."
-#: ../cli.py:591 ../cli.py:693
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Пакет(и) који ће се инсталирати"
-#: ../cli.py:592 ../cli.py:672 ../cli.py:694 ../yumcommands.py:157
-#: ../yumcommands.py:1015
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Нема шта да се ради"
-#: ../cli.py:625
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d пакети означени за ажурирање"
-#: ../cli.py:628
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Нема пакета означених за ажурирање"
-#: ../cli.py:642
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d пакети означени за уклањање"
-#: ../cli.py:645
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Нема пакета означених за уклањање"
-#: ../cli.py:671
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Пакет(и) који ће се уназадити"
-#: ../cli.py:684
+#: ../cli.py:707
+#, fuzzy, python-format
+msgid " (from %s)"
+msgstr " %s из %s"
+
+#: ../cli.py:709
+#, fuzzy, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Не постоји доступан пакет %s%s%s."
+
+#: ../cli.py:716
+msgid "Package(s) to reinstall"
+msgstr "Пакет(и) који ће се поново инсталирати"
+
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Ниједан пакет није добављен"
-#: ../cli.py:739
-msgid "Matching packages for package list to user args"
-msgstr "Повезивање пакета за списак пакета према аргументима корисника"
-
-#: ../cli.py:788
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Упозорење: није нађено подударање за %s"
-#: ../cli.py:791
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Нису пронађена подударања"
-#: ../cli.py:830
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -265,108 +284,108 @@ msgstr ""
" Можете употребити „%s*/%s%s“ и/или „%s*bin/%s%s“ да бисте добили такво "
"понашање"
-#: ../cli.py:846
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Нису пронађени пакети за %s"
-#: ../cli.py:858
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Чистим све"
-#: ../cli.py:872
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Чистим заглавља"
-#: ../cli.py:875
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Чистим пакете"
-#: ../cli.py:878
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Чистим xml метаподатке"
-#: ../cli.py:881
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Чистим кеш базе података"
-#: ../cli.py:884
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Чистим expire-cache метаподатке"
-#: ../cli.py:887
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Чистим додатке"
-#: ../cli.py:912
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Инсталиране групе:"
-#: ../cli.py:924
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Доступне групе:"
-#: ../cli.py:934
+#: ../cli.py:959
msgid "Done"
msgstr "Урађено"
-#: ../cli.py:945 ../cli.py:963 ../cli.py:969 ../yum/__init__.py:2420
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Упозорење: група %s не постоји."
-#: ../cli.py:973
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Нема доступних пакета за инсталацију или ажурирање у свим захтеваним групама"
-#: ../cli.py:975
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d пакет(и) за инсталацију"
-#: ../cli.py:985 ../yum/__init__.py:2432
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Не постоји група под именом %s"
-#: ../cli.py:991
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Нема пакета за уклањање из група"
-#: ../cli.py:993
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d пакет(и) за уклањање"
-#: ../cli.py:1035
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Пакет %s је већ инсталиран, прескачем га"
-#: ../cli.py:1046
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Уклањам неупоредив пакет %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1072
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Не постоји инсталиран други %s, додајем га у списак за потенцијалну "
"инсталацију"
-#: ../cli.py:1092
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Опције додатка"
-#: ../cli.py:1100
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Грешка командне линије: %s"
-#: ../cli.py:1113
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -377,258 +396,258 @@ msgstr ""
"\n"
"%s: %s опција захтева аргумент"
-#: ../cli.py:1171
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color прима један од следећих: auto, always, never"
-#: ../cli.py:1278
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "прикажи ову помоћну поруку и изађи"
-#: ../cli.py:1282
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "буди толерантан на грешке"
-#: ../cli.py:1284
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "извршавај се у потпуности из кеша, не ажурирај кеш"
-#: ../cli.py:1286
+#: ../cli.py:1306
msgid "config file location"
msgstr "место датотеке подешавања"
-#: ../cli.py:1288
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "најдуже време чекања на команду"
-#: ../cli.py:1290
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "ниво излазног приказа за проналажење грешака"
-#: ../cli.py:1294
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
"приказуј дупликате, у ризницама, у командама за излиставање/претраживање"
-#: ../cli.py:1296
+#: ../cli.py:1316
msgid "error output level"
msgstr "ниво излазног приказа грешака"
-#: ../cli.py:1299
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "тиха радња"
-#: ../cli.py:1301
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "опширна радња"
-#: ../cli.py:1303
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "одговори са да на сва питања"
-#: ../cli.py:1305
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "прикажи Yum верзију и изађи"
-#: ../cli.py:1306
+#: ../cli.py:1326
msgid "set install root"
msgstr "постави корени директоријум инсталације"
-#: ../cli.py:1310
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "укључи једну или више ризница (скраћенице су дозвољене)"
-#: ../cli.py:1314
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "искључи једну или више ризница (скраћенице су дозвољене)"
-#: ../cli.py:1317
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "изузми пакет(е) по имену или глобу"
-#: ../cli.py:1319
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "искључи изузимање из главног скупа, за ризницу или за све"
-#: ../cli.py:1322
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "укључи обраду застарелих пакета у току ажурирања"
-#: ../cli.py:1324
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "искључи додатке за Yum"
-#: ../cli.py:1326
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "искључи проверу gpg потписа"
-#: ../cli.py:1328
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "искључи додатке по имену"
-#: ../cli.py:1331
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "укључи додатке по имену"
-#: ../cli.py:1334
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "прескочи пакете који имају проблема са решавањем зависности"
-#: ../cli.py:1336
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "контролише да ли се користи боја"
-#: ../output.py:301
+#: ../output.py:305
msgid "Jan"
msgstr "јан"
-#: ../output.py:301
+#: ../output.py:305
msgid "Feb"
msgstr "феб"
-#: ../output.py:301
+#: ../output.py:305
msgid "Mar"
msgstr "мар"
-#: ../output.py:301
+#: ../output.py:305
msgid "Apr"
msgstr "апр"
-#: ../output.py:301
+#: ../output.py:305
msgid "May"
msgstr "мај"
-#: ../output.py:301
+#: ../output.py:305
msgid "Jun"
msgstr "јун"
-#: ../output.py:302
+#: ../output.py:306
msgid "Jul"
msgstr "јул"
-#: ../output.py:302
+#: ../output.py:306
msgid "Aug"
msgstr "авг"
-#: ../output.py:302
+#: ../output.py:306
msgid "Sep"
msgstr "сеп"
-#: ../output.py:302
+#: ../output.py:306
msgid "Oct"
msgstr "окт"
-#: ../output.py:302
+#: ../output.py:306
msgid "Nov"
msgstr "нов"
-#: ../output.py:302
+#: ../output.py:306
msgid "Dec"
msgstr "дец"
-#: ../output.py:312
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Покушавам други одраз."
-#: ../output.py:534
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Име : %s%s%s"
-#: ../output.py:535
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Архитектура: %s"
-#: ../output.py:537
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Период : %s"
-#: ../output.py:538
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Верзија : %s"
-#: ../output.py:539
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Издање : %s"
-#: ../output.py:540
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Величина : %s"
-#: ../output.py:541
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Ризница : %s"
-#: ../output.py:543
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Из ризнице : %s"
-#: ../output.py:545
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Објављивач : %s"
-#: ../output.py:546
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Објављен : %s"
-#: ../output.py:547
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Направљен : %s"
-#: ../output.py:549
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Инсталиран : %s"
-#: ../output.py:550
+#: ../output.py:554
msgid "Summary : "
msgstr "Сажетак :"
-#: ../output.py:552
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "УРЛ : %s"
-#: ../output.py:553
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Лиценца : %s"
-#: ../output.py:554
+#: ../output.py:558
msgid "Description: "
msgstr "Опис : "
-#: ../output.py:622
+#: ../output.py:626
msgid "y"
msgstr "d"
-#: ../output.py:622
+#: ../output.py:626
msgid "yes"
msgstr "da"
-#: ../output.py:623
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:623
+#: ../output.py:627
msgid "no"
msgstr "ne"
-#: ../output.py:627
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "Да ли је ово у реду [d/N]: "
-#: ../output.py:715
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -637,133 +656,142 @@ msgstr ""
"\n"
"Група: %s"
-#: ../output.py:719
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " ИБ групе: %s"
-#: ../output.py:724
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Опис: %s"
-#: ../output.py:726
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Обавезни пакети:"
-#: ../output.py:727
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Подразумевани пакети:"
-#: ../output.py:728
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " Изборни пакети:"
-#: ../output.py:729
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Условљени пакети:"
-#: ../output.py:749
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "пакет: %s"
-#: ../output.py:751
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Не постоје зависности овог пакета"
-#: ../output.py:756
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " зависност: %s"
-#: ../output.py:758
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Незадовољена зависност"
-#: ../output.py:830
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Ризница : %s"
-#: ../output.py:831
+#: ../output.py:838
msgid "Matched from:"
msgstr "Повезан из :"
-#: ../output.py:839
+#: ../output.py:847
msgid "Description : "
msgstr "Опис : "
-#: ../output.py:842
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "УРЛ : %s"
-#: ../output.py:845
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Лиценца : %s"
-#: ../output.py:848
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Име датотеке: %s"
-#: ../output.py:852
+#: ../output.py:860
msgid "Other : "
msgstr "Остало : "
-#: ../output.py:885
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "Догодила се грешка при рачунању укупне величине за преузимање"
-#: ../output.py:890
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Укупна величина: %s"
-#: ../output.py:893
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Укупна величина за преузимање: %s"
-#: ../output.py:935
+#: ../output.py:942
+#, fuzzy
+msgid "Reinstalling"
+msgstr "Инсталирам"
+
+#: ../output.py:943
+msgid "Downgrading"
+msgstr ""
+
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Инсталирам због зависности"
-#: ../output.py:936
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Ажурирам због зависности"
-#: ../output.py:937
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Уклањам због зависности"
-#: ../output.py:944 ../output.py:1042
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Прескочено (проблеми са зависностима)"
-#: ../output.py:965
+#: ../output.py:976
msgid "Package"
msgstr "Пакет"
-#: ../output.py:965
+#: ../output.py:976
msgid "Arch"
msgstr "Архитектура"
-#: ../output.py:966
+#: ../output.py:977
msgid "Version"
msgstr "Верзија"
-#: ../output.py:966
+#: ../output.py:977
msgid "Repository"
msgstr "Ризница"
-#: ../output.py:967
+#: ../output.py:978
msgid "Size"
msgstr "Величина"
-#: ../output.py:979
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -772,49 +800,55 @@ msgstr ""
" замењујем %s%s%s.%s %s\n"
"\n"
-#: ../output.py:988
+#: ../output.py:999
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
"%s\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
msgstr ""
-"\n"
-"Сажетак трансакције\n"
-"%s\n"
-"Инсталација %5.5s пакет(а) \n"
-"Ажурирање %5.5s пакет(а) \n"
-"Уклањање %5.5s пакет(а) \n"
-#: ../output.py:1036
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr "Уклоњено"
-#: ../output.py:1037
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Зависност уклоњена"
-#: ../output.py:1039
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Зависност инсталирана"
-#: ../output.py:1041
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Зависност ажурирана"
-#: ../output.py:1043
+#: ../output.py:1066
msgid "Replaced"
msgstr "Замењено"
-#: ../output.py:1044
+#: ../output.py:1067
msgid "Failed"
msgstr "Неуспех"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1110
+#: ../output.py:1133
msgid "two"
msgstr "два"
@@ -822,88 +856,266 @@ msgstr "два"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1121
-#, python-format
+#: ../output.py:1144
+#, fuzzy, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
"\n"
" Тренутно преузимање је обустављено, %sinterrupt (ctrl-c) још једном%s у "
"току %s%s%s секунди да бисте изашли.\n"
-#: ../output.py:1131
+#: ../output.py:1155
msgid "user interrupt"
msgstr "прекид од стране корисника"
-#: ../output.py:1147
+#: ../output.py:1173
msgid "Total"
msgstr "Укупно"
-#: ../output.py:1161
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Извршавам трансакцију"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Грешка при провери трансакције:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Остало : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "УРЛ : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#, fuzzy
+msgid "Return-Code :"
+msgstr "ИБ ризнице : "
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Превазиђени"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Неуспех"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Грешка при провери трансакције:\n"
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Ниједан пакет није добављен"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Грешка: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "инсталиран"
-#: ../output.py:1162
+#: ../output.py:1525
msgid "updated"
msgstr "ажуриран"
-#: ../output.py:1163
+#: ../output.py:1526
msgid "obsoleted"
msgstr "превазиђен"
-#: ../output.py:1164
+#: ../output.py:1527
msgid "erased"
msgstr "обрисан"
-#: ../output.py:1168
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Пакет %s.%s %s:%s-%s постављен да буде %s"
-#: ../output.py:1175
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Извршава се провера трансакције"
-#: ../output.py:1180
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Поновно покретање разрешавања зависности са новим променама."
-#: ../output.py:1185
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Завршено је разрешавање зависности"
-#: ../output.py:1190
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Обрађујем зависност: %s за пакет: %s"
-#: ../output.py:1195
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Неразрешена зависност: %s"
-#: ../output.py:1201
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Сукоб при обради: %s се сукоби са %s"
-#: ../output.py:1204
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
"--> Попуњавам скуп трансакције са изабраним пакетима. Молим вас, сачекајте."
-#: ../output.py:1208
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Преузимам заглавље за %s ради паковања у скуп трансакције."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Излазим када корисник откаже"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Излазим када се сломи цев"
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Завршено!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Морате бити root корисник да бисте извршили ову команду."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -934,314 +1146,349 @@ msgstr ""
"\n"
"За више информација контактирајте добављача ваше дистрибуције или пакета.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Грешка: потребно је да додате списак пакета за %s"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Грешка: потребно је придружити ставку"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Грешка: потребна је група или списак група"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Грешка: clean захтева опцију: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Грешка: погрешан clean аргумент:%r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Не постоји аргумент за командно окружење"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Име датотеке је прослеђено командном окружењу: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
"Не постоји датотека %s, која је прослеђена као аргумент командном окружењу."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
"Грешка: више од једне датотеке је прослеђено као аргумент командном окружењу."
-#: ../yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "ПАКЕТ..."
-#: ../yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Инсталирајте пакет или пакете на ваш систем"
-#: ../yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Постављам процес инсталације"
-#: ../yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[ПАКЕТ...]"
-#: ../yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Ажурирај пакет или пакете на вашем систему"
-#: ../yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Постављам процес ажурирања"
-#: ../yumcommands.py:241
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Прикажи детаље о сваком пакету или групи пакета"
-#: ../yumcommands.py:290
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Инсталирани пакети"
-#: ../yumcommands.py:298
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Доступни пакети"
-#: ../yumcommands.py:302
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Додатни пакети"
-#: ../yumcommands.py:306
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Ажурирани пакети"
#. This only happens in verbose mode
-#: ../yumcommands.py:314 ../yumcommands.py:321 ../yumcommands.py:598
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Превазиђени пакети"
-#: ../yumcommands.py:323
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Недавно додати пакети"
-#: ../yumcommands.py:330
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Не постоје одговарајући пакети за излиставање"
-#: ../yumcommands.py:344
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Излистај пакете или групе пакета"
-#: ../yumcommands.py:356
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Уклоните пакет или пакете са вашег система"
-#: ../yumcommands.py:363
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Постављам процес уклањања"
-#: ../yumcommands.py:377
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Постављам процес за групе"
-#: ../yumcommands.py:383
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Не постоји група над којом се може извршити команда"
-#: ../yumcommands.py:396
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Излистај доступне групе пакета"
-#: ../yumcommands.py:413
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Инсталирајте пакете у групи на вашем систему"
-#: ../yumcommands.py:435
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Уклоните пакете у групи са вашег система"
-#: ../yumcommands.py:462
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Прикажи детаље о групи пакета"
-#: ../yumcommands.py:486
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Направи кеш са метаподацима"
-#: ../yumcommands.py:492
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Правим кеш датотеке за све датотеке са метаподацима."
-#: ../yumcommands.py:493
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr "Ово може да потраје у зависности од брзине вашег рачунара"
-#: ../yumcommands.py:514
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Направљен је кеш са метаподацима"
-#: ../yumcommands.py:528
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Уклони кеширане податке"
-#: ../yumcommands.py:549
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Пронађи који пакет пружа дату вредност"
-#: ../yumcommands.py:569
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Проверите да ли су доступна ажурирања пакета"
-#: ../yumcommands.py:618
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Претражите детаље о пакету за задату ниску"
-#: ../yumcommands.py:624
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Претражујем пакете: "
-#: ../yumcommands.py:641
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Ажурирајте пакете узимајући превазиђене у обзир"
-#: ../yumcommands.py:649
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Постављам процес надградње"
-#: ../yumcommands.py:663
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Инсталирај локални RPM"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Постављам процес локалних пакета"
-#: ../yumcommands.py:690
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Одреди који пакети пружају дату зависност"
-#: ../yumcommands.py:693
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Претражујем пакете у потрази за зависностима:"
-#: ../yumcommands.py:707
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Извршавај интерактивно yum командно окружење"
-#: ../yumcommands.py:713
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Постављам yum командно окружење"
-#: ../yumcommands.py:731
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Излистај зависности пакета"
-#: ../yumcommands.py:737
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Тражим зависности: "
-#: ../yumcommands.py:753
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Прикажи подешене софтверске ризнице"
-#: ../yumcommands.py:801 ../yumcommands.py:802
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "укључена"
-#: ../yumcommands.py:810 ../yumcommands.py:811
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "искључена"
-#: ../yumcommands.py:825
-msgid "Repo-id : "
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
msgstr "ИБ ризнице : "
-#: ../yumcommands.py:826
-msgid "Repo-name : "
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
msgstr "Име ризнице : "
-#: ../yumcommands.py:827
-msgid "Repo-status : "
+#: ../yumcommands.py:836
+#, fuzzy
+msgid "Repo-status : "
msgstr "Статус ризнице : "
-#: ../yumcommands.py:829
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Ревизија ризнице : "
-#: ../yumcommands.py:833
-msgid "Repo-tags : "
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
msgstr "Ознаке ризнице : "
-#: ../yumcommands.py:839
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Дистро ознаке ризнице: "
-#: ../yumcommands.py:844
-msgid "Repo-updated: "
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
msgstr "Ризница ажурирана : "
-#: ../yumcommands.py:846
-msgid "Repo-pkgs : "
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
msgstr "Пакети ризнице : "
-#: ../yumcommands.py:847
-msgid "Repo-size : "
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
msgstr "Величина ризнице : "
-#: ../yumcommands.py:854
-msgid "Repo-baseurl: "
+#: ../yumcommands.py:863
+#, fuzzy
+msgid "Repo-baseurl : "
msgstr "Основни УРЛ ризнице : "
-#: ../yumcommands.py:858
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Металинк ризнице : "
-#: ../yumcommands.py:862
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Ажурирано : "
-#: ../yumcommands.py:865
-msgid "Repo-mirrors: "
+#: ../yumcommands.py:878
+#, fuzzy
+msgid "Repo-mirrors : "
msgstr "Одрази ризнице : "
-#: ../yumcommands.py:869
-msgid "Repo-exclude: "
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Непознат"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, fuzzy, python-format
+msgid "Instant (last: %s)"
+msgstr "Инсталиран : %s"
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:895
+#, fuzzy
+msgid "Repo-expire : "
+msgstr "Величина ризнице : "
+
+#: ../yumcommands.py:898
+#, fuzzy
+msgid "Repo-exclude : "
msgstr "Ризница искључена : "
-#: ../yumcommands.py:873
-msgid "Repo-include: "
+#: ../yumcommands.py:902
+#, fuzzy
+msgid "Repo-include : "
msgstr "Ризница укључена : "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:883 ../yumcommands.py:909
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "репо id"
-#: ../yumcommands.py:897 ../yumcommands.py:898 ../yumcommands.py:912
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "статус"
-#: ../yumcommands.py:910
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "репо име"
-#: ../yumcommands.py:936
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Прикажи корисну поруку о употреби"
-#: ../yumcommands.py:970
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Није доступна помоћ за %s"
-#: ../yumcommands.py:975
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1251,7 +1498,7 @@ msgstr ""
"\n"
"псеудоними: "
-#: ../yumcommands.py:977
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1261,122 +1508,141 @@ msgstr ""
"\n"
"псеудоним: "
-#: ../yumcommands.py:1005
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Постављам процес поновне инсталације"
-#: ../yumcommands.py:1014
-msgid "Package(s) to reinstall"
-msgstr "Пакет(и) који ће се поново инсталирати"
-
-#: ../yumcommands.py:1021
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "поновно инсталирам пакет"
-#: ../yumcommands.py:1039
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Постављам процес уназађивања"
-#: ../yumcommands.py:1046
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "уназади пакет"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
msgstr ""
-"\n"
-"\n"
-"Излазим када корисник откаже"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " ИБ групе: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Пакет"
+
+#: ../yumcommands.py:1152
+#, fuzzy
+msgid "Installed:"
+msgstr "Инсталирани"
+
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Инсталирани"
+
+#: ../yumcommands.py:1166
+#, fuzzy
+msgid "Available:"
+msgstr "Доступне групе:"
+
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Доступне групе:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
msgstr ""
-"\n"
-"\n"
-"Излазим када се сломи цев"
-#: ../yummain.py:126
+#: ../yummain.py:128
msgid "Running"
msgstr "Извршава се"
-#: ../yummain.py:127
+#: ../yummain.py:129
msgid "Sleeping"
msgstr "Успаван"
-#: ../yummain.py:128
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "Непрекидан"
-#: ../yummain.py:129
+#: ../yummain.py:131
msgid "Zombie"
msgstr "Зомби"
-#: ../yummain.py:130
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr "Праћен/заустављен"
-#: ../yummain.py:131
-msgid "Unknown"
-msgstr "Непознат"
-
-#: ../yummain.py:135
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " Други програм је: PackageKit"
-#: ../yummain.py:137
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " Други програм је: %s"
-#: ../yummain.py:140
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Меморија: %5s RSS (%5sБ VSZ)"
-#: ../yummain.py:144
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " Покренут: %s - %s раније"
-#: ../yummain.py:146
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " Стање : %s, pid: %d"
-#: ../yummain.py:171
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"Неки други програм тренутно држи yum закључаним; чекам да тај програм "
"изађе..."
-#: ../yummain.py:199 ../yummain.py:238
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Грешка: %s"
-#: ../yummain.py:209 ../yummain.py:250
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Непозната грешка(е): излазни код: %d:"
#. Depsolve stage
-#: ../yummain.py:216
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "Разрешавам зависности"
-#: ../yummain.py:240
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
msgstr ""
" Можете да пробате употребу --skip-broken опције ради заобилажења проблема"
-#: ../yummain.py:241
+#: ../yummain.py:243
msgid ""
" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
@@ -1386,7 +1652,7 @@ msgstr ""
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"
-#: ../yummain.py:256
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1394,11 +1660,7 @@ msgstr ""
"\n"
"Зависности су разрешене"
-#: ../yummain.py:270
-msgid "Complete!"
-msgstr "Завршено!"
-
-#: ../yummain.py:317
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1408,196 +1670,196 @@ msgstr ""
"\n"
"Излазим када корисник откаже."
-#: ../yum/depsolve.py:84
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/depsolve.py:99
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Постављам TransactionSets пре него што се подигне класа подешавања"
-#: ../yum/depsolve.py:150
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Погрешан tsflag у датотеци подешавања: %s"
-#: ../yum/depsolve.py:161
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Претражујем pkgSack за зависност: %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Могуће слагање за %s од %s"
-#: ../yum/depsolve.py:192
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Повезан %s ради захтевања за %s"
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Члан: %s"
-#: ../yum/depsolve.py:247 ../yum/depsolve.py:739
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s пребачен за инсталацију"
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Додајем пакет %s у начину рада %s"
-#: ../yum/depsolve.py:264
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Уклањам пакет %s"
-#: ../yum/depsolve.py:275
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s захтева: %s"
-#: ../yum/depsolve.py:333
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Потребан захтев је већ потражен, обмањујем"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Потребан захтев није име пакета. Тражим: %s"
-#: ../yum/depsolve.py:350
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Могући снабдевач: %s"
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Режим је %s за снабдевача %s: %s"
-#: ../yum/depsolve.py:377
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Режим за пакет који снабдева %s: %s"
-#: ../yum/depsolve.py:381
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: %s пакет захтева да %s буде означен за брисање"
-#: ../yum/depsolve.py:394
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: мењам %s са %s ради разрешавања зависности."
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: ажурирам %s ради разрешавања зависности."
-#: ../yum/depsolve.py:405
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Не могу да пронађем путању ажурирања за зависност за: %s"
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Неразрешив захтев пакета %s за %s"
-#: ../yum/depsolve.py:438
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Брзо повезивање пакета %s као захтева за %s"
#. is it already installed?
-#: ../yum/depsolve.py:480
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s је у пруженим пакетима али је већ инсталиран, уклањам га."
-#: ../yum/depsolve.py:496
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Потенцијално разрешавање пакета %s има новији примерак у ts-у."
-#: ../yum/depsolve.py:507
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Потенцијално разрешавање пакета %s има инсталиран новији примерак."
-#: ../yum/depsolve.py:515 ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Недостаје зависност: %s је потребан од стране пакета %s"
-#: ../yum/depsolve.py:528
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s је већ у ts-у, прескачем га"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: означавам %s као ажурирање за %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: означавам %s као инсталацију за %s"
-#: ../yum/depsolve.py:675 ../yum/depsolve.py:757
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Успех - празна трансакција"
-#: ../yum/depsolve.py:714 ../yum/depsolve.py:729
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Поново покрећем петљу"
-#: ../yum/depsolve.py:745
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Завршетак процеса зависности"
-#: ../yum/depsolve.py:751
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s из %s има проблема са разрешавањем зависности"
-#: ../yum/depsolve.py:758
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Успех - зависности су разрешене"
-#: ../yum/depsolve.py:772
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Проверавам зависности за %s"
-#: ../yum/depsolve.py:855
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "тражим %s као захтев за %s"
-#: ../yum/depsolve.py:997
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Покрећем compare_providers() за %s"
-#: ../yum/depsolve.py:1025 ../yum/depsolve.py:1031
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "боља архитектура у пакету %s"
-#: ../yum/depsolve.py:1092
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s превазилази %s"
-#: ../yum/depsolve.py:1108
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1606,98 +1868,103 @@ msgstr ""
"archdist упоредио %s са %s на %s\n"
" Победник: %s"
-#: ../yum/depsolve.py:1115
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "заједнички изворни rpm %s и %s"
-#: ../yum/depsolve.py:1121
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "заједнички префикс %s између %s и %s"
-#: ../yum/depsolve.py:1129
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Најбољи редослед: %s"
-#: ../yum/__init__.py:158
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Ризници %r недостаје име у подешавањима, користим id"
-#: ../yum/__init__.py:405
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "већ иницијализовани додаци"
-#: ../yum/__init__.py:412
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:423
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Читам локални RPMDB"
-#: ../yum/__init__.py:441
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:461
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:478
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Постављам групе пакета"
-#: ../yum/__init__.py:521
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "репо објекту за репо %s недостаје a _resetSack метода\n"
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "због тога се овај репо не може вратити на почетну поставку.\n"
-#: ../yum/__init__.py:527
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:539
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Изграђујем објекат ажурирања"
-#: ../yum/__init__.py:570
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() неће бити присутна у будућим верзијама Yum-а.\n"
-#: ../yum/__init__.py:595
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Добављам метаподатке групе"
-#: ../yum/__init__.py:621
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Додајем датотеку групе из ризнице: %s"
-#: ../yum/__init__.py:630
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Није успело додавање датотеке групе за ризницу: %s - %s"
-#: ../yum/__init__.py:636
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Не постоји група која је доступна у било којој ризници"
-#: ../yum/__init__.py:686
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Увозим додатне информације о списковима датотека"
-#: ../yum/__init__.py:695
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1705,17 +1972,17 @@ msgstr ""
"Остале су недовршене трансакције. Можда би прво требало да извршите yum-"
"complete-transaction да бисте их завршили."
-#: ../yum/__init__.py:761
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Skip-broken етапа %i"
-#: ../yum/__init__.py:813
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Skip-broken је завршен у %i етапа "
-#: ../yum/__init__.py:814
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1723,93 +1990,80 @@ msgstr ""
"\n"
"Пакети су прескочени због проблема са зависностима:"
-#: ../yum/__init__.py:818
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s из %s"
-#: ../yum/__init__.py:958
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Упозорење: дошло је до грешке у скриптици или неке друге некритичне грешке "
"током трансакције."
-#: ../yum/__init__.py:973
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Није успело уклањање датотеке трансакције %s"
-#: ../yum/__init__.py:1015
-#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr "изузимам из трошка: %s из %s"
-
-#: ../yum/__init__.py:1046
-msgid "Excluding Packages in global exclude list"
-msgstr "Изузимам пакете у глобалном списку за изузимање"
-
-#: ../yum/__init__.py:1048
-#, python-format
-msgid "Excluding Packages from %s"
-msgstr "Изузимам пакете из %s"
-
-#: ../yum/__init__.py:1077
-#, python-format
-msgid "Reducing %s to included packages only"
-msgstr "Сажимам %s само у садржане пакете"
-
-#: ../yum/__init__.py:1083
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "Keeping included package %s"
-msgstr "Задржавам садржани пакет %s"
+msgid "%s was supposed to be installed but is not!"
+msgstr ""
-#: ../yum/__init__.py:1089
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Removing unmatched package %s"
-msgstr "Уклањам неповезани пакет %s"
-
-#: ../yum/__init__.py:1092
-msgid "Finished"
-msgstr "Завршио"
+msgid "%s was supposed to be removed but is not!"
+msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1122
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Нисам у могућности да проверим да ли је PID %s активан"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Постоји закључавање %s: друга копија се извршава као pid %s."
-#: ../yum/__init__.py:1196
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Пакет није одговарајући за намеравано преузимање"
-#: ../yum/__init__.py:1211
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Не могу да извршим контролу суме"
-#: ../yum/__init__.py:1214
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Пакет нема одговарајући контролну суму"
-#: ../yum/__init__.py:1257
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"пакет нема одговарајућу вредност контролне суме или је за %s укључено "
"кеширање"
-#: ../yum/__init__.py:1260 ../yum/__init__.py:1289
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "користим локални %s умножак"
-#: ../yum/__init__.py:1301
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1820,11 +2074,11 @@ msgstr ""
" * слободно је %s\n"
" * потребно је %s"
-#: ../yum/__init__.py:1348
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Заглавље није потпуно."
-#: ../yum/__init__.py:1385
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1832,62 +2086,62 @@ msgstr ""
"Заглавље није у локалном кешу и само начин рада са кеширањем је укључен. Не "
"могу да преузмем %s"
-#: ../yum/__init__.py:1440
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Јавни кључ за %s није инсталиран"
-#: ../yum/__init__.py:1444
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Проблем са отварањем пакета %s"
-#: ../yum/__init__.py:1452
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Јавни кључ за %s није поверљив"
-#: ../yum/__init__.py:1456
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Пакет %s није потписан"
-#: ../yum/__init__.py:1494
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Не могу да уклоним %s"
-#: ../yum/__init__.py:1498
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s је уклоњен"
-#: ../yum/__init__.py:1534
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Не могу да уклоним %s датотеку %s"
-#: ../yum/__init__.py:1538
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s датотека %s је уклоњена"
-#: ../yum/__init__.py:1540
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s датотеке су уклоњене"
-#: ../yum/__init__.py:1609
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Постоји више од једног идентичног слагања у групи за %s"
-#: ../yum/__init__.py:1615
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ништа се не слаже са %s.%s %s:%s-%s из ажурирања"
-#: ../yum/__init__.py:1833
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1895,172 +2149,180 @@ msgstr ""
"searchPackages() неће бити присутна у будућим Yum "
"верзијама. Уместо ње користите searchGenerator(). \n"
-#: ../yum/__init__.py:1875
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Претражујем %d пакете"
-#: ../yum/__init__.py:1879
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "тражим пакет %s"
-#: ../yum/__init__.py:1891
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "тражим у уносима датотека"
-#: ../yum/__init__.py:1898
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "тражим у уносима достављача"
-#: ../yum/__init__.py:1931
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Доставља-слагање: %s"
-#: ../yum/__init__.py:1980
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Нема доступних података о групама за подешене ризнице"
-#: ../yum/__init__.py:2011 ../yum/__init__.py:2030 ../yum/__init__.py:2061
-#: ../yum/__init__.py:2067 ../yum/__init__.py:2146 ../yum/__init__.py:2150
-#: ../yum/__init__.py:2446
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Не постоји група под именом %s"
-#: ../yum/__init__.py:2042 ../yum/__init__.py:2163
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "пакет %s није означен у групи %s"
-#: ../yum/__init__.py:2089
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Додајем пакет %s из групе %s"
-#: ../yum/__init__.py:2093
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Ниједан пакет под именом %s није доступан за инсталацију"
-#: ../yum/__init__.py:2190
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Група пакета %s није нађена у packagesack-у"
-#: ../yum/__init__.py:2204
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() ће нестати, користите self.rpmdb.searchPkgTuple"
-"().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Група пакета %s није нађена у packagesack-у"
-#: ../yum/__init__.py:2260 ../yum/__init__.py:2304
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Погрешна ознака верзије"
-#: ../yum/__init__.py:2275 ../yum/__init__.py:2279
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Нема пронађених пакета за %s"
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Објекат пакета није био примерак објекта пакета"
-#: ../yum/__init__.py:2483
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Није одређено ништа за инсталацију"
-#: ../yum/__init__.py:2499 ../yum/__init__.py:3126
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Проверавам виртуелну доставу или доставу датотеке за %s"
-#: ../yum/__init__.py:2505 ../yum/__init__.py:2782 ../yum/__init__.py:2942
-#: ../yum/__init__.py:3132
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Не постоји слагање за аргумент: %s"
-#: ../yum/__init__.py:2579
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Пакет %s је инсталиран и није доступан"
-#: ../yum/__init__.py:2582
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Нема пакета доступних за инсталацију"
-#: ../yum/__init__.py:2594
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Пакет: %s - већ је у скупу трансакције"
-#: ../yum/__init__.py:2609
+#: ../yum/__init__.py:2839
+#, fuzzy, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s"
+
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "Пакет %s је замењен пакетом %s, покушавам да наместо инсталирам %s"
-#: ../yum/__init__.py:2617
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Већ је инсталирана најновија верзија пакета %s"
-#: ../yum/__init__.py:2631
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"Пакет који се поклапа са %s је већ инсталиран. Проверавам за новију верзију."
#. update everything (the easy case)
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Ажурирам све"
-#: ../yum/__init__.py:2735 ../yum/__init__.py:2844 ../yum/__init__.py:2865
-#: ../yum/__init__.py:2891
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Не ажурирам пакете који су већ превазиђени: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2770 ../yum/__init__.py:2939
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2835
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Пакет је већ превазиђен: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2868 ../yum/__init__.py:2894
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Не ажурирам пакете који су већ превазиђени: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Не ажурирам пакете који су већ ажурирани: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2955
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Ниједан пакет није одређен за уклањање"
-#: ../yum/__init__.py:2989
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Не могу да отворим датотеку: %s. Прескачем је."
-#: ../yum/__init__.py:2992
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Испитујем %s: %s"
-#: ../yum/__init__.py:3000
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Не могу да додам пакет %s у трансакцију. Архитектура није усаглашена: %s"
-#: ../yum/__init__.py:3008
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2069,94 +2331,100 @@ msgstr ""
"Пакет %s није инсталиран, не могу да га ажурирам. Извршите yum инсталацију "
"да бисте га инсталирали."
-#: ../yum/__init__.py:3043
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Изузимам %s"
-#: ../yum/__init__.py:3048
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Означавам %s за инсталацију"
-#: ../yum/__init__.py:3054
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Означавам %s као ажурирање за %s"
-#: ../yum/__init__.py:3061
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: не ажурира инсталирани пакет."
-#: ../yum/__init__.py:3076
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Проблем при поновној инсталацији: ниједан пакет није одређен за уклањање"
-#: ../yum/__init__.py:3088 ../yum/__init__.py:3159
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Пакету %s су дозвољене многоструке инсталације, прескачем га"
-#: ../yum/__init__.py:3097
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, fuzzy, python-format
+msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
"Проблем при поновној инсталацији: ниједан пакет није одређен за инсталацију"
-#: ../yum/__init__.py:3151
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Нема пакета доступних за уназађивање"
-#: ../yum/__init__.py:3182
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Нема доступног одговарајућег пакета: %s"
-#: ../yum/__init__.py:3188
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Само је надградња доступна за пакет: %s"
-#: ../yum/__init__.py:3249
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Пакет(и) који ће се уназадити"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Добављам GPG кључ са %s"
-#: ../yum/__init__.py:3269
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Добављање GPG кључа није успело: "
-#: ../yum/__init__.py:3280
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Рашчлањивање GPG кључа није успело: кључ нема вредност %s"
-#: ../yum/__init__.py:3312
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG кључ на %s (0x%s) је већ инсталиран"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3317 ../yum/__init__.py:3379
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Увозим GPG кључ 0x%s „%s“ из %s"
-#: ../yum/__init__.py:3334
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Не инсталирам кључ"
-#: ../yum/__init__.py:3340
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Није успео увоз кључа (код %d)"
-#: ../yum/__init__.py:3341 ../yum/__init__.py:3400
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Кључ је успешно увезен"
-#: ../yum/__init__.py:3346 ../yum/__init__.py:3405
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2167,78 +2435,78 @@ msgstr ""
"одговарајући за овај пакет.\n"
"Проверите да ли су подешени одговарајући УРЛ-ови кључева за ову ризницу."
-#: ../yum/__init__.py:3355
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Увоз кључа(кључева) није помогао, погрешан кључ(кључеви)?"
-#: ../yum/__init__.py:3374
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG кључ на %s (0x%s) је већ увезен"
-#: ../yum/__init__.py:3394
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Не инсталирам кључ за ризницу %s"
-#: ../yum/__init__.py:3399
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Није успео увоз кључа"
-#: ../yum/__init__.py:3490
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Не могу да пронађем одговарајући одраз."
-#: ../yum/__init__.py:3492
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Појавиле су се грешке за време преузимања пакета."
-#: ../yum/__init__.py:3533
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Пријавите ову грешку код %s"
-#: ../yum/__init__.py:3557
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Грешке при провери трансакције: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:204
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr "Учитани додаци: "
-#: ../yum/plugins.py:218 ../yum/plugins.py:224
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr "Не постоји слагање за додатак: %s"
-#: ../yum/plugins.py:254
+#: ../yum/plugins.py:252
#, python-format
msgid "Not loading \"%s\" plugin, as it is disabled"
msgstr "Не учитавам додатак „%s“ пошто је искључен"
#. Give full backtrace:
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Додатак „%s“ не може да буде увезен"
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Додатак „%s“ не одређује верзију захтеваног API-а"
-#: ../yum/plugins.py:278
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Додатак „%s“ захтева API %s. Подржани API је %s."
-#: ../yum/plugins.py:311
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "Учитавам „%s“ додатак"
-#: ../yum/plugins.py:318
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -2246,19 +2514,19 @@ msgstr ""
"У путањи за претраживање додатака постоје два или више додатака под именом „%"
"s“"
-#: ../yum/plugins.py:338
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr "Датотека подешавања %s није пронађена"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:341
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Не могу да пронађем датотеку подешавања за додатак %s"
-#: ../yum/plugins.py:499
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "регистрација команди није подржана"
@@ -2296,3 +2564,49 @@ msgstr "Оштећено заглавље %s"
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Грешка при отварању rpm-а %s - грешка %s"
+
+#~ msgid "Matching packages for package list to user args"
+#~ msgstr "Повезивање пакета за списак пакета према аргументима корисника"
+
+#~ msgid ""
+#~ "\n"
+#~ "Transaction Summary\n"
+#~ "%s\n"
+#~ "Install %5.5s Package(s) \n"
+#~ "Update %5.5s Package(s) \n"
+#~ "Remove %5.5s Package(s) \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Сажетак трансакције\n"
+#~ "%s\n"
+#~ "Инсталација %5.5s пакет(а) \n"
+#~ "Ажурирање %5.5s пакет(а) \n"
+#~ "Уклањање %5.5s пакет(а) \n"
+
+#~ msgid "excluding for cost: %s from %s"
+#~ msgstr "изузимам из трошка: %s из %s"
+
+#~ msgid "Excluding Packages in global exclude list"
+#~ msgstr "Изузимам пакете у глобалном списку за изузимање"
+
+#~ msgid "Excluding Packages from %s"
+#~ msgstr "Изузимам пакете из %s"
+
+#~ msgid "Reducing %s to included packages only"
+#~ msgstr "Сажимам %s само у садржане пакете"
+
+#~ msgid "Keeping included package %s"
+#~ msgstr "Задржавам садржани пакет %s"
+
+#~ msgid "Removing unmatched package %s"
+#~ msgstr "Уклањам неповезани пакет %s"
+
+#~ msgid "Finished"
+#~ msgstr "Завршио"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() ће нестати, користите self.rpmdb."
+#~ "searchPkgTuple().\n"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 9253fd9..1400fba 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-01 19:44+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-04-01 21:06+0100\n"
"Last-Translator: Miloš Komarčević <kmilos@gmail.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../callback.py:48 ../output.py:933 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Ažuriram"
@@ -27,7 +27,7 @@ msgstr "Ažuriram"
msgid "Erasing"
msgstr "Brišem"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:932
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Instaliram"
@@ -36,15 +36,16 @@ msgstr "Instaliram"
msgid "Obsoleted"
msgstr "Prevaziđeni"
-#: ../callback.py:54 ../output.py:1040
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Ažurirani"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Obrisani"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1038
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Instalirani"
@@ -66,7 +67,7 @@ msgstr "Greška: pogrešno izlazno stanje: %s za %s"
msgid "Erased: %s"
msgstr "Obrisano: %s"
-#: ../callback.py:217 ../output.py:934
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Uklanjam"
@@ -74,60 +75,60 @@ msgstr "Uklanjam"
msgid "Cleanup"
msgstr "Čišćenje"
-#: ../cli.py:104
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Naredba „%s“ je već definisana"
-#: ../cli.py:116
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Postavljam riznice"
-#: ../cli.py:127
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Čitam metapodatke riznica iz lokalnih datoteka"
-#: ../cli.py:190 ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Greška pri podešavanju: %s"
-#: ../cli.py:193 ../cli.py:1231 ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Greška u opcijama: %s"
-#: ../cli.py:221
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Instaliran : %s-%s %s"
-#: ../cli.py:223
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Napravio/la: %s %s"
-#: ../cli.py:225
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Objavio/la : %s %s"
-#: ../cli.py:264
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Morate da unesete neku komandu"
-#: ../cli.py:307
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Zahtevi diska:\n"
-#: ../cli.py:309
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Potrebno je najmanje %dMB na %s sistemu datoteka.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:314
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -135,56 +136,64 @@ msgstr ""
"Sažetak grešaka\n"
"-------------\n"
-#: ../cli.py:357
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Pokušavam da izvršim transakciju ali nema šta da se radi. Izlazim."
-#: ../cli.py:393
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Izlazim na komandu korisnika"
-#: ../cli.py:397
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Preuzimam pakete:"
-#: ../cli.py:402
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Greška pri preuzimanju paketa:\n"
-#: ../cli.py:416 ../yum/__init__.py:3528
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Izvršavam rpm_check_debug"
-#: ../cli.py:419 ../yum/__init__.py:3531
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "GREŠKA sa rpm_check_debug u odnosu na depsolve:"
-#: ../cli.py:423
+#: ../cli.py:435
+msgid "RPM needs to be updated"
+msgstr ""
+
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Prijavite ovu grešku u %s"
-#: ../cli.py:429
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Izvršavam proveru transakcije"
-#: ../cli.py:445
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Završena je provera transakcije"
-#: ../cli.py:447
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Greška pri proveri transakcije:\n"
-#: ../cli.py:454
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Provera transakcije je uspela"
-#: ../cli.py:475
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Izvršavam transakciju"
-#: ../cli.py:505
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -192,69 +201,79 @@ msgstr ""
"Odbijam da automatski uvezem ključeve kada se izvršavanje ne nadgleda.\n"
"Za prevazilaženje ovoga koristite „-y“."
-#: ../cli.py:524 ../cli.py:558
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Možda ste mislili: "
-#: ../cli.py:541 ../cli.py:549
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "%s%s%s paket je dostupan, ali nije instaliran."
-#: ../cli.py:555 ../cli.py:586 ../cli.py:666
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Ne postoji dostupan paket %s%s%s."
-#: ../cli.py:591 ../cli.py:693
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Paket(i) koji će se instalirati"
-#: ../cli.py:592 ../cli.py:672 ../cli.py:694 ../yumcommands.py:157
-#: ../yumcommands.py:1015
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Nema šta da se radi"
-#: ../cli.py:625
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paketi označeni za ažuriranje"
-#: ../cli.py:628
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Nema paketa označenih za ažuriranje"
-#: ../cli.py:642
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paketi označeni za uklanjanje"
-#: ../cli.py:645
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Nema paketa označenih za uklanjanje"
-#: ../cli.py:671
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Paket(i) koji će se unazaditi"
-#: ../cli.py:684
+#: ../cli.py:707
+#, fuzzy, python-format
+msgid " (from %s)"
+msgstr " %s iz %s"
+
+#: ../cli.py:709
+#, fuzzy, python-format
+msgid "Installed package %s%s%s%s not available."
+msgstr "Ne postoji dostupan paket %s%s%s."
+
+#: ../cli.py:716
+msgid "Package(s) to reinstall"
+msgstr "Paket(i) koji će se ponovo instalirati"
+
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Nijedan paket nije dobavljen"
-#: ../cli.py:739
-msgid "Matching packages for package list to user args"
-msgstr "Povezivanje paketa za spisak paketa prema argumentima korisnika"
-
-#: ../cli.py:788
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Upozorenje: nije nađeno podudaranje za %s"
-#: ../cli.py:791
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Nisu pronađena podudaranja"
-#: ../cli.py:830
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -265,108 +284,108 @@ msgstr ""
" Možete upotrebiti „%s*/%s%s“ i/ili „%s*bin/%s%s“ da biste dobili takvo "
"ponašanje"
-#: ../cli.py:846
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Nisu pronađeni paketi za %s"
-#: ../cli.py:858
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Čistim sve"
-#: ../cli.py:872
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Čistim zaglavlja"
-#: ../cli.py:875
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Čistim pakete"
-#: ../cli.py:878
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Čistim xml metapodatke"
-#: ../cli.py:881
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Čistim keš baze podataka"
-#: ../cli.py:884
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Čistim expire-cache metapodatke"
-#: ../cli.py:887
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Čistim dodatke"
-#: ../cli.py:912
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Instalirane grupe:"
-#: ../cli.py:924
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Dostupne grupe:"
-#: ../cli.py:934
+#: ../cli.py:959
msgid "Done"
msgstr "Urađeno"
-#: ../cli.py:945 ../cli.py:963 ../cli.py:969 ../yum/__init__.py:2420
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Upozorenje: grupa %s ne postoji."
-#: ../cli.py:973
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Nema dostupnih paketa za instalaciju ili ažuriranje u svim zahtevanim grupama"
-#: ../cli.py:975
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paket(i) za instalaciju"
-#: ../cli.py:985 ../yum/__init__.py:2432
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Ne postoji grupa pod imenom %s"
-#: ../cli.py:991
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Nema paketa za uklanjanje iz grupa"
-#: ../cli.py:993
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paket(i) za uklanjanje"
-#: ../cli.py:1035
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Paket %s je već instaliran, preskačem ga"
-#: ../cli.py:1046
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Uklanjam neuporediv paket %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1072
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Ne postoji instaliran drugi %s, dodajem ga u spisak za potencijalnu "
"instalaciju"
-#: ../cli.py:1092
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Opcije dodatka"
-#: ../cli.py:1100
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Greška komandne linije: %s"
-#: ../cli.py:1113
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -377,258 +396,258 @@ msgstr ""
"\n"
"%s: %s opcija zahteva argument"
-#: ../cli.py:1171
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color prima jedan od sledećih: auto, always, never"
-#: ../cli.py:1278
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "prikaži ovu pomoćnu poruku i izađi"
-#: ../cli.py:1282
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "budi tolerantan na greške"
-#: ../cli.py:1284
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "izvršavaj se u potpunosti iz keša, ne ažuriraj keš"
-#: ../cli.py:1286
+#: ../cli.py:1306
msgid "config file location"
msgstr "mesto datoteke podešavanja"
-#: ../cli.py:1288
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "najduže vreme čekanja na komandu"
-#: ../cli.py:1290
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "nivo izlaznog prikaza za pronalaženje grešaka"
-#: ../cli.py:1294
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
"prikazuj duplikate, u riznicama, u komandama za izlistavanje/pretraživanje"
-#: ../cli.py:1296
+#: ../cli.py:1316
msgid "error output level"
msgstr "nivo izlaznog prikaza grešaka"
-#: ../cli.py:1299
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "tiha radnja"
-#: ../cli.py:1301
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "opširna radnja"
-#: ../cli.py:1303
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "odgovori sa da na sva pitanja"
-#: ../cli.py:1305
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "prikaži Yum verziju i izađi"
-#: ../cli.py:1306
+#: ../cli.py:1326
msgid "set install root"
msgstr "postavi koreni direktorijum instalacije"
-#: ../cli.py:1310
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "uključi jednu ili više riznica (skraćenice su dozvoljene)"
-#: ../cli.py:1314
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "isključi jednu ili više riznica (skraćenice su dozvoljene)"
-#: ../cli.py:1317
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "izuzmi paket(e) po imenu ili globu"
-#: ../cli.py:1319
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "isključi izuzimanje iz glavnog skupa, za riznicu ili za sve"
-#: ../cli.py:1322
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "uključi obradu zastarelih paketa u toku ažuriranja"
-#: ../cli.py:1324
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "isključi dodatke za Yum"
-#: ../cli.py:1326
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "isključi proveru gpg potpisa"
-#: ../cli.py:1328
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "isključi dodatke po imenu"
-#: ../cli.py:1331
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "uključi dodatke po imenu"
-#: ../cli.py:1334
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "preskoči pakete koji imaju problema sa rešavanjem zavisnosti"
-#: ../cli.py:1336
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "kontroliše da li se koristi boja"
-#: ../output.py:301
+#: ../output.py:305
msgid "Jan"
msgstr "jan"
-#: ../output.py:301
+#: ../output.py:305
msgid "Feb"
msgstr "feb"
-#: ../output.py:301
+#: ../output.py:305
msgid "Mar"
msgstr "mar"
-#: ../output.py:301
+#: ../output.py:305
msgid "Apr"
msgstr "apr"
-#: ../output.py:301
+#: ../output.py:305
msgid "May"
msgstr "maj"
-#: ../output.py:301
+#: ../output.py:305
msgid "Jun"
msgstr "jun"
-#: ../output.py:302
+#: ../output.py:306
msgid "Jul"
msgstr "jul"
-#: ../output.py:302
+#: ../output.py:306
msgid "Aug"
msgstr "avg"
-#: ../output.py:302
+#: ../output.py:306
msgid "Sep"
msgstr "sep"
-#: ../output.py:302
+#: ../output.py:306
msgid "Oct"
msgstr "okt"
-#: ../output.py:302
+#: ../output.py:306
msgid "Nov"
msgstr "nov"
-#: ../output.py:302
+#: ../output.py:306
msgid "Dec"
msgstr "dec"
-#: ../output.py:312
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Pokušavam drugi odraz."
-#: ../output.py:534
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Ime : %s%s%s"
-#: ../output.py:535
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Arhitektura: %s"
-#: ../output.py:537
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Period : %s"
-#: ../output.py:538
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Verzija : %s"
-#: ../output.py:539
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Izdanje : %s"
-#: ../output.py:540
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Veličina : %s"
-#: ../output.py:541
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Riznica : %s"
-#: ../output.py:543
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Iz riznice : %s"
-#: ../output.py:545
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Objavljivač: %s"
-#: ../output.py:546
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Objavljen : %s"
-#: ../output.py:547
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Napravljen : %s"
-#: ../output.py:549
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Instaliran : %s"
-#: ../output.py:550
+#: ../output.py:554
msgid "Summary : "
msgstr "Sažetak :"
-#: ../output.py:552
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:553
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Licenca : %s"
-#: ../output.py:554
+#: ../output.py:558
msgid "Description: "
msgstr "Opis : "
-#: ../output.py:622
+#: ../output.py:626
msgid "y"
msgstr "d"
-#: ../output.py:622
+#: ../output.py:626
msgid "yes"
msgstr "da"
-#: ../output.py:623
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:623
+#: ../output.py:627
msgid "no"
msgstr "ne"
-#: ../output.py:627
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "Da li je ovo u redu [d/N]: "
-#: ../output.py:715
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -637,133 +656,142 @@ msgstr ""
"\n"
"Grupa: %s"
-#: ../output.py:719
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " IB grupe: %s"
-#: ../output.py:724
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Opis: %s"
-#: ../output.py:726
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Obavezni paketi:"
-#: ../output.py:727
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Podrazumevani paketi:"
-#: ../output.py:728
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " Izborni paketi:"
-#: ../output.py:729
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Uslovljeni paketi:"
-#: ../output.py:749
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "paket: %s"
-#: ../output.py:751
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Ne postoje zavisnosti ovog paketa"
-#: ../output.py:756
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " zavisnost: %s"
-#: ../output.py:758
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Nezadovoljena zavisnost"
-#: ../output.py:830
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Riznica : %s"
-#: ../output.py:831
+#: ../output.py:838
msgid "Matched from:"
msgstr "Povezan iz :"
-#: ../output.py:839
+#: ../output.py:847
msgid "Description : "
msgstr "Opis : "
-#: ../output.py:842
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:845
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Licenca : %s"
-#: ../output.py:848
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Ime datoteke: %s"
-#: ../output.py:852
+#: ../output.py:860
msgid "Other : "
msgstr "Ostalo : "
-#: ../output.py:885
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "Dogodila se greška pri računanju ukupne veličine za preuzimanje"
-#: ../output.py:890
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Ukupna veličina: %s"
-#: ../output.py:893
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Ukupna veličina za preuzimanje: %s"
-#: ../output.py:935
+#: ../output.py:942
+#, fuzzy
+msgid "Reinstalling"
+msgstr "Instaliram"
+
+#: ../output.py:943
+msgid "Downgrading"
+msgstr ""
+
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Instaliram zbog zavisnosti"
-#: ../output.py:936
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Ažuriram zbog zavisnosti"
-#: ../output.py:937
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Uklanjam zbog zavisnosti"
-#: ../output.py:944 ../output.py:1042
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Preskočeno (problemi sa zavisnostima)"
-#: ../output.py:965
+#: ../output.py:976
msgid "Package"
msgstr "Paket"
-#: ../output.py:965
+#: ../output.py:976
msgid "Arch"
msgstr "Arhitektura"
-#: ../output.py:966
+#: ../output.py:977
msgid "Version"
msgstr "Verzija"
-#: ../output.py:966
+#: ../output.py:977
msgid "Repository"
msgstr "Riznica"
-#: ../output.py:967
+#: ../output.py:978
msgid "Size"
msgstr "Veličina"
-#: ../output.py:979
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -772,49 +800,55 @@ msgstr ""
" zamenjujem %s%s%s.%s %s\n"
"\n"
-#: ../output.py:988
+#: ../output.py:999
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
"%s\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
msgstr ""
-"\n"
-"Sažetak transakcije\n"
-"%s\n"
-"Instalacija %5.5s paket(a) \n"
-"Ažuriranje %5.5s paket(a) \n"
-"Uklanjanje %5.5s paket(a) \n"
-#: ../output.py:1036
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr "Uklonjeno"
-#: ../output.py:1037
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Zavisnost uklonjena"
-#: ../output.py:1039
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Zavisnost instalirana"
-#: ../output.py:1041
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Zavisnost ažurirana"
-#: ../output.py:1043
+#: ../output.py:1066
msgid "Replaced"
msgstr "Zamenjeno"
-#: ../output.py:1044
+#: ../output.py:1067
msgid "Failed"
msgstr "Neuspeh"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1110
+#: ../output.py:1133
msgid "two"
msgstr "dva"
@@ -822,88 +856,266 @@ msgstr "dva"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1121
-#, python-format
+#: ../output.py:1144
+#, fuzzy, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
"\n"
" Trenutno preuzimanje je obustavljeno, %sinterrupt (ctrl-c) još jednom%s u "
"toku %s%s%s sekundi da biste izašli.\n"
-#: ../output.py:1131
+#: ../output.py:1155
msgid "user interrupt"
msgstr "prekid od strane korisnika"
-#: ../output.py:1147
+#: ../output.py:1173
msgid "Total"
msgstr "Ukupno"
-#: ../output.py:1161
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Izvršavam transakciju"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Greška pri proveri transakcije:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Ostalo : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+#, fuzzy
+msgid "Return-Code :"
+msgstr "IB riznice : "
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Prevaziđeni"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Neuspeh"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Greška pri proveri transakcije:\n"
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Nijedan paket nije dobavljen"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Greška: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "instaliran"
-#: ../output.py:1162
+#: ../output.py:1525
msgid "updated"
msgstr "ažuriran"
-#: ../output.py:1163
+#: ../output.py:1526
msgid "obsoleted"
msgstr "prevaziđen"
-#: ../output.py:1164
+#: ../output.py:1527
msgid "erased"
msgstr "obrisan"
-#: ../output.py:1168
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paket %s.%s %s:%s-%s postavljen da bude %s"
-#: ../output.py:1175
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Izvršava se provera transakcije"
-#: ../output.py:1180
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Ponovno pokretanje razrešavanja zavisnosti sa novim promenama."
-#: ../output.py:1185
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Završeno je razrešavanje zavisnosti"
-#: ../output.py:1190
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Obrađujem zavisnost: %s za paket: %s"
-#: ../output.py:1195
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Nerazrešena zavisnost: %s"
-#: ../output.py:1201
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Sukob pri obradi: %s se sukobi sa %s"
-#: ../output.py:1204
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
"--> Popunjavam skup transakcije sa izabranim paketima. Molim vas, sačekajte."
-#: ../output.py:1208
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Preuzimam zaglavlje za %s radi pakovanja u skup transakcije."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Izlazim kada korisnik otkaže"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Izlazim kada se slomi cev"
+
+#: ../utils.py:145 ../yummain.py:50
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr "%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Završeno!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Morate biti root korisnik da biste izvršili ovu komandu."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -934,315 +1146,350 @@ msgstr ""
"\n"
"Za više informacija kontaktirajte dobavljača vaše distribucije ili paketa.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Greška: potrebno je da dodate spisak paketa za %s"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Greška: potrebno je pridružiti stavku"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Greška: potrebna je grupa ili spisak grupa"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Greška: clean zahteva opciju: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Greška: pogrešan clean argument:%r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Ne postoji argument za komandno okruženje"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Ime datoteke je prosleđeno komandnom okruženju: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
"Ne postoji datoteka %s, koja je prosleđena kao argument komandnom okruženju."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
"Greška: više od jedne datoteke je prosleđeno kao argument komandnom "
"okruženju."
-#: ../yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAKET..."
-#: ../yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Instalirajte paket ili pakete na vaš sistem"
-#: ../yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Postavljam proces instalacije"
-#: ../yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAKET...]"
-#: ../yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Ažuriraj paket ili pakete na vašem sistemu"
-#: ../yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Postavljam proces ažuriranja"
-#: ../yumcommands.py:241
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Prikaži detalje o svakom paketu ili grupi paketa"
-#: ../yumcommands.py:290
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Instalirani paketi"
-#: ../yumcommands.py:298
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Dostupni paketi"
-#: ../yumcommands.py:302
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Dodatni paketi"
-#: ../yumcommands.py:306
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Ažurirani paketi"
#. This only happens in verbose mode
-#: ../yumcommands.py:314 ../yumcommands.py:321 ../yumcommands.py:598
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Prevaziđeni paketi"
-#: ../yumcommands.py:323
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Nedavno dodati paketi"
-#: ../yumcommands.py:330
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Ne postoje odgovarajući paketi za izlistavanje"
-#: ../yumcommands.py:344
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Izlistaj pakete ili grupe paketa"
-#: ../yumcommands.py:356
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Uklonite paket ili pakete sa vašeg sistema"
-#: ../yumcommands.py:363
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Postavljam proces uklanjanja"
-#: ../yumcommands.py:377
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Postavljam proces za grupe"
-#: ../yumcommands.py:383
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Ne postoji grupa nad kojom se može izvršiti komanda"
-#: ../yumcommands.py:396
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Izlistaj dostupne grupe paketa"
-#: ../yumcommands.py:413
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Instalirajte pakete u grupi na vašem sistemu"
-#: ../yumcommands.py:435
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Uklonite pakete u grupi sa vašeg sistema"
-#: ../yumcommands.py:462
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Prikaži detalje o grupi paketa"
-#: ../yumcommands.py:486
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Napravi keš sa metapodacima"
-#: ../yumcommands.py:492
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Pravim keš datoteke za sve datoteke sa metapodacima."
-#: ../yumcommands.py:493
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr "Ovo može da potraje u zavisnosti od brzine vašeg računara"
-#: ../yumcommands.py:514
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Napravljen je keš sa metapodacima"
-#: ../yumcommands.py:528
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Ukloni keširane podatke"
-#: ../yumcommands.py:549
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Pronađi koji paket pruža datu vrednost"
-#: ../yumcommands.py:569
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Proverite da li su dostupna ažuriranja paketa"
-#: ../yumcommands.py:618
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Pretražite detalje o paketu za zadatu nisku"
-#: ../yumcommands.py:624
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Pretražujem pakete: "
-#: ../yumcommands.py:641
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Ažurirajte pakete uzimajući prevaziđene u obzir"
-#: ../yumcommands.py:649
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Postavljam proces nadgradnje"
-#: ../yumcommands.py:663
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Instaliraj lokalni RPM"
-#: ../yumcommands.py:671
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Postavljam proces lokalnih paketa"
-#: ../yumcommands.py:690
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Odredi koji paketi pružaju datu zavisnost"
-#: ../yumcommands.py:693
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Pretražujem pakete u potrazi za zavisnostima:"
-#: ../yumcommands.py:707
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Izvršavaj interaktivno yum komandno okruženje"
-#: ../yumcommands.py:713
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Postavljam yum komandno okruženje"
-#: ../yumcommands.py:731
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Izlistaj zavisnosti paketa"
-#: ../yumcommands.py:737
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Tražim zavisnosti: "
-#: ../yumcommands.py:753
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Prikaži podešene softverske riznice"
-#: ../yumcommands.py:801 ../yumcommands.py:802
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "uključena"
-#: ../yumcommands.py:810 ../yumcommands.py:811
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "isključena"
-#: ../yumcommands.py:825
-msgid "Repo-id : "
+#: ../yumcommands.py:834
+#, fuzzy
+msgid "Repo-id : "
msgstr "IB riznice : "
-#: ../yumcommands.py:826
-msgid "Repo-name : "
+#: ../yumcommands.py:835
+#, fuzzy
+msgid "Repo-name : "
msgstr "Ime riznice : "
-#: ../yumcommands.py:827
-msgid "Repo-status : "
+#: ../yumcommands.py:836
+#, fuzzy
+msgid "Repo-status : "
msgstr "Status riznice : "
-#: ../yumcommands.py:829
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Revizija riznice : "
-#: ../yumcommands.py:833
-msgid "Repo-tags : "
+#: ../yumcommands.py:842
+#, fuzzy
+msgid "Repo-tags : "
msgstr "Oznake riznice : "
-#: ../yumcommands.py:839
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Distro oznake riznice: "
-#: ../yumcommands.py:844
-msgid "Repo-updated: "
+#: ../yumcommands.py:853
+#, fuzzy
+msgid "Repo-updated : "
msgstr "Riznica ažurirana : "
-#: ../yumcommands.py:846
-msgid "Repo-pkgs : "
+#: ../yumcommands.py:855
+#, fuzzy
+msgid "Repo-pkgs : "
msgstr "Paketi riznice : "
-#: ../yumcommands.py:847
-msgid "Repo-size : "
+#: ../yumcommands.py:856
+#, fuzzy
+msgid "Repo-size : "
msgstr "Veličina riznice : "
-#: ../yumcommands.py:854
-msgid "Repo-baseurl: "
+#: ../yumcommands.py:863
+#, fuzzy
+msgid "Repo-baseurl : "
msgstr "Osnovni URL riznice : "
-#: ../yumcommands.py:858
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Metalink riznice : "
-#: ../yumcommands.py:862
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Ažurirano : "
-#: ../yumcommands.py:865
-msgid "Repo-mirrors: "
+#: ../yumcommands.py:878
+#, fuzzy
+msgid "Repo-mirrors : "
msgstr "Odrazi riznice : "
-#: ../yumcommands.py:869
-msgid "Repo-exclude: "
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr "Nepoznat"
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, fuzzy, python-format
+msgid "Instant (last: %s)"
+msgstr "Instaliran : %s"
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:895
+#, fuzzy
+msgid "Repo-expire : "
+msgstr "Veličina riznice : "
+
+#: ../yumcommands.py:898
+#, fuzzy
+msgid "Repo-exclude : "
msgstr "Riznica isključena : "
-#: ../yumcommands.py:873
-msgid "Repo-include: "
+#: ../yumcommands.py:902
+#, fuzzy
+msgid "Repo-include : "
msgstr "Riznica uključena : "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:883 ../yumcommands.py:909
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "repo id"
-#: ../yumcommands.py:897 ../yumcommands.py:898 ../yumcommands.py:912
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "status"
-#: ../yumcommands.py:910
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "repo ime"
-#: ../yumcommands.py:936
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Prikaži korisnu poruku o upotrebi"
-#: ../yumcommands.py:970
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Nije dostupna pomoć za %s"
-#: ../yumcommands.py:975
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1252,7 +1499,7 @@ msgstr ""
"\n"
"pseudonimi: "
-#: ../yumcommands.py:977
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1262,122 +1509,141 @@ msgstr ""
"\n"
"pseudonim: "
-#: ../yumcommands.py:1005
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Postavljam proces ponovne instalacije"
-#: ../yumcommands.py:1014
-msgid "Package(s) to reinstall"
-msgstr "Paket(i) koji će se ponovo instalirati"
-
-#: ../yumcommands.py:1021
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "ponovno instaliram paket"
-#: ../yumcommands.py:1039
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Postavljam proces unazađivanja"
-#: ../yumcommands.py:1046
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "unazadi paket"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
msgstr ""
-"\n"
-"\n"
-"Izlazim kada korisnik otkaže"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " IB grupe: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Paket"
+
+#: ../yumcommands.py:1152
+#, fuzzy
+msgid "Installed:"
+msgstr "Instalirani"
+
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Instalirani"
+
+#: ../yumcommands.py:1166
+#, fuzzy
+msgid "Available:"
+msgstr "Dostupne grupe:"
+
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Dostupne grupe:"
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
msgstr ""
-"\n"
-"\n"
-"Izlazim kada se slomi cev"
-#: ../yummain.py:126
+#: ../yummain.py:128
msgid "Running"
msgstr "Izvršava se"
-#: ../yummain.py:127
+#: ../yummain.py:129
msgid "Sleeping"
msgstr "Uspavan"
-#: ../yummain.py:128
+#: ../yummain.py:130
msgid "Uninteruptable"
msgstr "Neprekidan"
-#: ../yummain.py:129
+#: ../yummain.py:131
msgid "Zombie"
msgstr "Zombi"
-#: ../yummain.py:130
+#: ../yummain.py:132
msgid "Traced/Stopped"
msgstr "Praćen/zaustavljen"
-#: ../yummain.py:131
-msgid "Unknown"
-msgstr "Nepoznat"
-
-#: ../yummain.py:135
+#: ../yummain.py:137
msgid " The other application is: PackageKit"
msgstr " Drugi program je: PackageKit"
-#: ../yummain.py:137
+#: ../yummain.py:139
#, python-format
msgid " The other application is: %s"
msgstr " Drugi program je: %s"
-#: ../yummain.py:140
+#: ../yummain.py:142
#, python-format
msgid " Memory : %5s RSS (%5sB VSZ)"
msgstr " Memorija: %5s RSS (%5sB VSZ)"
-#: ../yummain.py:144
+#: ../yummain.py:146
#, python-format
msgid " Started: %s - %s ago"
msgstr " Pokrenut: %s - %s ranije"
-#: ../yummain.py:146
+#: ../yummain.py:148
#, python-format
msgid " State : %s, pid: %d"
msgstr " Stanje : %s, pid: %d"
-#: ../yummain.py:171
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
"Neki drugi program trenutno drži yum zaključanim; čekam da taj program "
"izađe..."
-#: ../yummain.py:199 ../yummain.py:238
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr "Greška: %s"
-#: ../yummain.py:209 ../yummain.py:250
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr "Nepoznata greška(e): izlazni kod: %d:"
#. Depsolve stage
-#: ../yummain.py:216
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr "Razrešavam zavisnosti"
-#: ../yummain.py:240
+#: ../yummain.py:242
msgid " You could try using --skip-broken to work around the problem"
msgstr ""
" Možete da probate upotrebu --skip-broken opcije radi zaobilaženja problema"
-#: ../yummain.py:241
+#: ../yummain.py:243
msgid ""
" You could try running: package-cleanup --problems\n"
" package-cleanup --dupes\n"
@@ -1387,7 +1653,7 @@ msgstr ""
" package-cleanup --dupes\n"
" rpm -Va --nofiles --nodigest"
-#: ../yummain.py:256
+#: ../yummain.py:259
msgid ""
"\n"
"Dependencies Resolved"
@@ -1395,11 +1661,7 @@ msgstr ""
"\n"
"Zavisnosti su razrešene"
-#: ../yummain.py:270
-msgid "Complete!"
-msgstr "Završeno!"
-
-#: ../yummain.py:317
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1409,196 +1671,196 @@ msgstr ""
"\n"
"Izlazim kada korisnik otkaže."
-#: ../yum/depsolve.py:84
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/depsolve.py:99
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Postavljam TransactionSets pre nego što se podigne klasa podešavanja"
-#: ../yum/depsolve.py:150
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Pogrešan tsflag u datoteci podešavanja: %s"
-#: ../yum/depsolve.py:161
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Pretražujem pkgSack za zavisnost: %s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Moguće slaganje za %s od %s"
-#: ../yum/depsolve.py:192
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Povezan %s radi zahtevanja za %s"
-#: ../yum/depsolve.py:233
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Član: %s"
-#: ../yum/depsolve.py:247 ../yum/depsolve.py:739
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s prebačen za instalaciju"
-#: ../yum/depsolve.py:254
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Dodajem paket %s u načinu rada %s"
-#: ../yum/depsolve.py:264
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Uklanjam paket %s"
-#: ../yum/depsolve.py:275
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s zahteva: %s"
-#: ../yum/depsolve.py:333
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Potreban zahtev je već potražen, obmanjujem"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Potreban zahtev nije ime paketa. Tražim: %s"
-#: ../yum/depsolve.py:350
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Mogući snabdevač: %s"
-#: ../yum/depsolve.py:373
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Režim je %s za snabdevača %s: %s"
-#: ../yum/depsolve.py:377
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Režim za paket koji snabdeva %s: %s"
-#: ../yum/depsolve.py:381
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: %s paket zahteva da %s bude označen za brisanje"
-#: ../yum/depsolve.py:394
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: menjam %s sa %s radi razrešavanja zavisnosti."
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: ažuriram %s radi razrešavanja zavisnosti."
-#: ../yum/depsolve.py:405
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Ne mogu da pronađem putanju ažuriranja za zavisnost za: %s"
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Nerazrešiv zahtev paketa %s za %s"
-#: ../yum/depsolve.py:438
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Brzo povezivanje paketa %s kao zahteva za %s"
#. is it already installed?
-#: ../yum/depsolve.py:480
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "%s je u pruženim paketima ali je već instaliran, uklanjam ga."
-#: ../yum/depsolve.py:496
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Potencijalno razrešavanje paketa %s ima noviji primerak u ts-u."
-#: ../yum/depsolve.py:507
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Potencijalno razrešavanje paketa %s ima instaliran noviji primerak."
-#: ../yum/depsolve.py:515 ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Nedostaje zavisnost: %s je potreban od strane paketa %s"
-#: ../yum/depsolve.py:528
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s je već u ts-u, preskačem ga"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: označavam %s kao ažuriranje za %s"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: označavam %s kao instalaciju za %s"
-#: ../yum/depsolve.py:675 ../yum/depsolve.py:757
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Uspeh - prazna transakcija"
-#: ../yum/depsolve.py:714 ../yum/depsolve.py:729
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Ponovo pokrećem petlju"
-#: ../yum/depsolve.py:745
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Završetak procesa zavisnosti"
-#: ../yum/depsolve.py:751
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s iz %s ima problema sa razrešavanjem zavisnosti"
-#: ../yum/depsolve.py:758
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Uspeh - zavisnosti su razrešene"
-#: ../yum/depsolve.py:772
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Proveravam zavisnosti za %s"
-#: ../yum/depsolve.py:855
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "tražim %s kao zahtev za %s"
-#: ../yum/depsolve.py:997
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Pokrećem compare_providers() za %s"
-#: ../yum/depsolve.py:1025 ../yum/depsolve.py:1031
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "bolja arhitektura u paketu %s"
-#: ../yum/depsolve.py:1092
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s prevazilazi %s"
-#: ../yum/depsolve.py:1108
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1607,98 +1869,103 @@ msgstr ""
"archdist uporedio %s sa %s na %s\n"
" Pobednik: %s"
-#: ../yum/depsolve.py:1115
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "zajednički izvorni rpm %s i %s"
-#: ../yum/depsolve.py:1121
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "zajednički prefiks %s između %s i %s"
-#: ../yum/depsolve.py:1129
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Najbolji redosled: %s"
-#: ../yum/__init__.py:158
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Riznici %r nedostaje ime u podešavanjima, koristim id"
-#: ../yum/__init__.py:405
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "već inicijalizovani dodaci"
-#: ../yum/__init__.py:412
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:423
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Čitam lokalni RPMDB"
-#: ../yum/__init__.py:441
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:461
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:478
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Postavljam grupe paketa"
-#: ../yum/__init__.py:521
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "repo objektu za repo %s nedostaje a _resetSack metoda\n"
-#: ../yum/__init__.py:522
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "zbog toga se ovaj repo ne može vratiti na početnu postavku.\n"
-#: ../yum/__init__.py:527
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:539
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Izgrađujem objekat ažuriranja"
-#: ../yum/__init__.py:570
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() neće biti prisutna u budućim verzijama Yuma.\n"
-#: ../yum/__init__.py:595
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Dobavljam metapodatke grupe"
-#: ../yum/__init__.py:621
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Dodajem datoteku grupe iz riznice: %s"
-#: ../yum/__init__.py:630
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Nije uspelo dodavanje datoteke grupe za riznicu: %s - %s"
-#: ../yum/__init__.py:636
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Ne postoji grupa koja je dostupna u bilo kojoj riznici"
-#: ../yum/__init__.py:686
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Uvozim dodatne informacije o spiskovima datoteka"
-#: ../yum/__init__.py:695
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1706,17 +1973,17 @@ msgstr ""
"Ostale su nedovršene transakcije. Možda bi prvo trebalo da izvršite yum-"
"complete-transaction da biste ih završili."
-#: ../yum/__init__.py:761
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Skip-broken etapa %i"
-#: ../yum/__init__.py:813
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Skip-broken je završen u %i etapa "
-#: ../yum/__init__.py:814
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1724,93 +1991,80 @@ msgstr ""
"\n"
"Paketi su preskočeni zbog problema sa zavisnostima:"
-#: ../yum/__init__.py:818
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s iz %s"
-#: ../yum/__init__.py:958
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Upozorenje: došlo je do greške u skriptici ili neke druge nekritične greške "
"tokom transakcije."
-#: ../yum/__init__.py:973
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Nije uspelo uklanjanje datoteke transakcije %s"
-#: ../yum/__init__.py:1015
-#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr "izuzimam iz troška: %s iz %s"
-
-#: ../yum/__init__.py:1046
-msgid "Excluding Packages in global exclude list"
-msgstr "Izuzimam pakete u globalnom spisku za izuzimanje"
-
-#: ../yum/__init__.py:1048
-#, python-format
-msgid "Excluding Packages from %s"
-msgstr "Izuzimam pakete iz %s"
-
-#: ../yum/__init__.py:1077
-#, python-format
-msgid "Reducing %s to included packages only"
-msgstr "Sažimam %s samo u sadržane pakete"
-
-#: ../yum/__init__.py:1083
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "Keeping included package %s"
-msgstr "Zadržavam sadržani paket %s"
+msgid "%s was supposed to be installed but is not!"
+msgstr ""
-#: ../yum/__init__.py:1089
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Removing unmatched package %s"
-msgstr "Uklanjam nepovezani paket %s"
-
-#: ../yum/__init__.py:1092
-msgid "Finished"
-msgstr "Završio"
+msgid "%s was supposed to be removed but is not!"
+msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1122
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Nisam u mogućnosti da proverim da li je PID %s aktivan"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1126
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Postoji zaključavanje %s: druga kopija se izvršava kao pid %s."
-#: ../yum/__init__.py:1196
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Paket nije odgovarajući za nameravano preuzimanje"
-#: ../yum/__init__.py:1211
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Ne mogu da izvršim kontrolu sume"
-#: ../yum/__init__.py:1214
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Paket nema odgovarajući kontrolnu sumu"
-#: ../yum/__init__.py:1257
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
"paket nema odgovarajuću vrednost kontrolne sume ili je za %s uključeno "
"keširanje"
-#: ../yum/__init__.py:1260 ../yum/__init__.py:1289
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "koristim lokalni %s umnožak"
-#: ../yum/__init__.py:1301
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1821,11 +2075,11 @@ msgstr ""
" * slobodno je %s\n"
" * potrebno je %s"
-#: ../yum/__init__.py:1348
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Zaglavlje nije potpuno."
-#: ../yum/__init__.py:1385
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1833,62 +2087,62 @@ msgstr ""
"Zaglavlje nije u lokalnom kešu i samo način rada sa keširanjem je uključen. "
"Ne mogu da preuzmem %s"
-#: ../yum/__init__.py:1440
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Javni ključ za %s nije instaliran"
-#: ../yum/__init__.py:1444
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problem sa otvaranjem paketa %s"
-#: ../yum/__init__.py:1452
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Javni ključ za %s nije poverljiv"
-#: ../yum/__init__.py:1456
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Paket %s nije potpisan"
-#: ../yum/__init__.py:1494
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Ne mogu da uklonim %s"
-#: ../yum/__init__.py:1498
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s je uklonjen"
-#: ../yum/__init__.py:1534
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Ne mogu da uklonim %s datoteku %s"
-#: ../yum/__init__.py:1538
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s datoteka %s je uklonjena"
-#: ../yum/__init__.py:1540
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s datoteke su uklonjene"
-#: ../yum/__init__.py:1609
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Postoji više od jednog identičnog slaganja u grupi za %s"
-#: ../yum/__init__.py:1615
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ništa se ne slaže sa %s.%s %s:%s-%s iz ažuriranja"
-#: ../yum/__init__.py:1833
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1896,172 +2150,180 @@ msgstr ""
"searchPackages() neće biti prisutna u budućim Yum "
"verzijama. Umesto nje koristite searchGenerator(). \n"
-#: ../yum/__init__.py:1875
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Pretražujem %d pakete"
-#: ../yum/__init__.py:1879
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "tražim paket %s"
-#: ../yum/__init__.py:1891
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "tražim u unosima datoteka"
-#: ../yum/__init__.py:1898
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "tražim u unosima dostavljača"
-#: ../yum/__init__.py:1931
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Dostavlja-slaganje: %s"
-#: ../yum/__init__.py:1980
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Nema dostupnih podataka o grupama za podešene riznice"
-#: ../yum/__init__.py:2011 ../yum/__init__.py:2030 ../yum/__init__.py:2061
-#: ../yum/__init__.py:2067 ../yum/__init__.py:2146 ../yum/__init__.py:2150
-#: ../yum/__init__.py:2446
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Ne postoji grupa pod imenom %s"
-#: ../yum/__init__.py:2042 ../yum/__init__.py:2163
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "paket %s nije označen u grupi %s"
-#: ../yum/__init__.py:2089
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Dodajem paket %s iz grupe %s"
-#: ../yum/__init__.py:2093
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Nijedan paket pod imenom %s nije dostupan za instalaciju"
-#: ../yum/__init__.py:2190
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Grupa paketa %s nije nađena u packagesacku"
-#: ../yum/__init__.py:2204
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() će nestati, koristite self.rpmdb.searchPkgTuple"
-"().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Grupa paketa %s nije nađena u packagesacku"
-#: ../yum/__init__.py:2260 ../yum/__init__.py:2304
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Pogrešna oznaka verzije"
-#: ../yum/__init__.py:2275 ../yum/__init__.py:2279
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Nema pronađenih paketa za %s"
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Objekat paketa nije bio primerak objekta paketa"
-#: ../yum/__init__.py:2483
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Nije određeno ništa za instalaciju"
-#: ../yum/__init__.py:2499 ../yum/__init__.py:3126
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "Proveravam virtuelnu dostavu ili dostavu datoteke za %s"
-#: ../yum/__init__.py:2505 ../yum/__init__.py:2782 ../yum/__init__.py:2942
-#: ../yum/__init__.py:3132
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Ne postoji slaganje za argument: %s"
-#: ../yum/__init__.py:2579
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Paket %s je instaliran i nije dostupan"
-#: ../yum/__init__.py:2582
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Nema paketa dostupnih za instalaciju"
-#: ../yum/__init__.py:2594
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Paket: %s - već je u skupu transakcije"
-#: ../yum/__init__.py:2609
+#: ../yum/__init__.py:2839
+#, fuzzy, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr "Paket %s je zamenjen paketom %s, pokušavam da namesto instaliram %s"
+
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "Paket %s je zamenjen paketom %s, pokušavam da namesto instaliram %s"
-#: ../yum/__init__.py:2617
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Već je instalirana najnovija verzija paketa %s"
-#: ../yum/__init__.py:2631
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
"Paket koji se poklapa sa %s je već instaliran. Proveravam za noviju verziju."
#. update everything (the easy case)
-#: ../yum/__init__.py:2717
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Ažuriram sve"
-#: ../yum/__init__.py:2735 ../yum/__init__.py:2844 ../yum/__init__.py:2865
-#: ../yum/__init__.py:2891
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Ne ažuriram pakete koji su već prevaziđeni: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2770 ../yum/__init__.py:2939
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:2835
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Paket je već prevaziđen: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2868 ../yum/__init__.py:2894
+#: ../yum/__init__.py:3124
+#, fuzzy, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr "Ne ažuriram pakete koji su već prevaziđeni: %s.%s %s:%s-%s"
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Ne ažuriram pakete koji su već ažurirani: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2955
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Nijedan paket nije određen za uklanjanje"
-#: ../yum/__init__.py:2989
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Ne mogu da otvorim datoteku: %s. Preskačem je."
-#: ../yum/__init__.py:2992
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Ispitujem %s: %s"
-#: ../yum/__init__.py:3000
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Ne mogu da dodam paket %s u transakciju. Arhitektura nije usaglašena: %s"
-#: ../yum/__init__.py:3008
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2070,94 +2332,100 @@ msgstr ""
"Paket %s nije instaliran, ne mogu da ga ažuriram. Izvršite yum instalaciju "
"da biste ga instalirali."
-#: ../yum/__init__.py:3043
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Izuzimam %s"
-#: ../yum/__init__.py:3048
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Označavam %s za instalaciju"
-#: ../yum/__init__.py:3054
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Označavam %s kao ažuriranje za %s"
-#: ../yum/__init__.py:3061
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: ne ažurira instalirani paket."
-#: ../yum/__init__.py:3076
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
"Problem pri ponovnoj instalaciji: nijedan paket nije određen za uklanjanje"
-#: ../yum/__init__.py:3088 ../yum/__init__.py:3159
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Paketu %s su dozvoljene mnogostruke instalacije, preskačem ga"
-#: ../yum/__init__.py:3097
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, fuzzy, python-format
+msgid "Problem in reinstall: no package %s matched to install"
msgstr ""
"Problem pri ponovnoj instalaciji: nijedan paket nije određen za instalaciju"
-#: ../yum/__init__.py:3151
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Nema paketa dostupnih za unazađivanje"
-#: ../yum/__init__.py:3182
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Nema dostupnog odgovarajućeg paketa: %s"
-#: ../yum/__init__.py:3188
+#: ../yum/__init__.py:3565
#, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Samo je nadgradnja dostupna za paket: %s"
-#: ../yum/__init__.py:3249
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Paket(i) koji će se unazaditi"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Dobavljam GPG ključ sa %s"
-#: ../yum/__init__.py:3269
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Dobavljanje GPG ključa nije uspelo: "
-#: ../yum/__init__.py:3280
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "Raščlanjivanje GPG ključa nije uspelo: ključ nema vrednost %s"
-#: ../yum/__init__.py:3312
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG ključ na %s (0x%s) je već instaliran"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3317 ../yum/__init__.py:3379
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Uvozim GPG ključ 0x%s „%s“ iz %s"
-#: ../yum/__init__.py:3334
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Ne instaliram ključ"
-#: ../yum/__init__.py:3340
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Nije uspeo uvoz ključa (kod %d)"
-#: ../yum/__init__.py:3341 ../yum/__init__.py:3400
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Ključ je uspešno uvezen"
-#: ../yum/__init__.py:3346 ../yum/__init__.py:3405
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2168,78 +2436,78 @@ msgstr ""
"odgovarajući za ovaj paket.\n"
"Proverite da li su podešeni odgovarajući URL-ovi ključeva za ovu riznicu."
-#: ../yum/__init__.py:3355
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Uvoz ključa(ključeva) nije pomogao, pogrešan ključ(ključevi)?"
-#: ../yum/__init__.py:3374
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG ključ na %s (0x%s) je već uvezen"
-#: ../yum/__init__.py:3394
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Ne instaliram ključ za riznicu %s"
-#: ../yum/__init__.py:3399
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Nije uspeo uvoz ključa"
-#: ../yum/__init__.py:3490
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Ne mogu da pronađem odgovarajući odraz."
-#: ../yum/__init__.py:3492
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Pojavile su se greške za vreme preuzimanja paketa."
-#: ../yum/__init__.py:3533
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Prijavite ovu grešku kod %s"
-#: ../yum/__init__.py:3557
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Greške pri proveri transakcije: "
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:204
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr "Učitani dodaci: "
-#: ../yum/plugins.py:218 ../yum/plugins.py:224
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr "Ne postoji slaganje za dodatak: %s"
-#: ../yum/plugins.py:254
+#: ../yum/plugins.py:252
#, python-format
msgid "Not loading \"%s\" plugin, as it is disabled"
msgstr "Ne učitavam dodatak „%s“ pošto je isključen"
#. Give full backtrace:
-#: ../yum/plugins.py:266
+#: ../yum/plugins.py:264
#, python-format
msgid "Plugin \"%s\" can't be imported"
msgstr "Dodatak „%s“ ne može da bude uvezen"
-#: ../yum/plugins.py:273
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr "Dodatak „%s“ ne određuje verziju zahtevanog API-a"
-#: ../yum/plugins.py:278
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr "Dodatak „%s“ zahteva API %s. Podržani API je %s."
-#: ../yum/plugins.py:311
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr "Učitavam „%s“ dodatak"
-#: ../yum/plugins.py:318
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
@@ -2247,19 +2515,19 @@ msgstr ""
"U putanji za pretraživanje dodataka postoje dva ili više dodataka pod imenom "
"„%s“"
-#: ../yum/plugins.py:338
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr "Datoteka podešavanja %s nije pronađena"
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:341
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr "Ne mogu da pronađem datoteku podešavanja za dodatak %s"
-#: ../yum/plugins.py:499
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "registracija komandi nije podržana"
@@ -2297,3 +2565,49 @@ msgstr "Oštećeno zaglavlje %s"
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Greška pri otvaranju rpm-a %s - greška %s"
+
+#~ msgid "Matching packages for package list to user args"
+#~ msgstr "Povezivanje paketa za spisak paketa prema argumentima korisnika"
+
+#~ msgid ""
+#~ "\n"
+#~ "Transaction Summary\n"
+#~ "%s\n"
+#~ "Install %5.5s Package(s) \n"
+#~ "Update %5.5s Package(s) \n"
+#~ "Remove %5.5s Package(s) \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sažetak transakcije\n"
+#~ "%s\n"
+#~ "Instalacija %5.5s paket(a) \n"
+#~ "Ažuriranje %5.5s paket(a) \n"
+#~ "Uklanjanje %5.5s paket(a) \n"
+
+#~ msgid "excluding for cost: %s from %s"
+#~ msgstr "izuzimam iz troška: %s iz %s"
+
+#~ msgid "Excluding Packages in global exclude list"
+#~ msgstr "Izuzimam pakete u globalnom spisku za izuzimanje"
+
+#~ msgid "Excluding Packages from %s"
+#~ msgstr "Izuzimam pakete iz %s"
+
+#~ msgid "Reducing %s to included packages only"
+#~ msgstr "Sažimam %s samo u sadržane pakete"
+
+#~ msgid "Keeping included package %s"
+#~ msgstr "Zadržavam sadržani paket %s"
+
+#~ msgid "Removing unmatched package %s"
+#~ msgstr "Uklanjam nepovezani paket %s"
+
+#~ msgid "Finished"
+#~ msgstr "Završio"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() će nestati, koristite self.rpmdb."
+#~ "searchPkgTuple().\n"
diff --git a/po/sv.po b/po/sv.po
index 75aa010..59a2df1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-05 08:55+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-09-05 16:56+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:938 ../yum/rpmtrans.py:71
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr "Uppdaterar"
@@ -25,7 +25,7 @@ msgstr "Uppdaterar"
msgid "Erasing"
msgstr "Raderar"
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:937
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr "Installerar"
@@ -34,15 +34,16 @@ msgstr "Installerar"
msgid "Obsoleted"
msgstr "Låter utgå"
-#: ../callback.py:54 ../output.py:1061
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "Uppdaterade"
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "Raderade"
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1059
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr "Installerade"
@@ -64,7 +65,7 @@ msgstr "Fel: ogiltig utdatatillstånd: %s för %s"
msgid "Erased: %s"
msgstr "Raderade: %s"
-#: ../callback.py:217 ../output.py:939
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr "Tar bort"
@@ -72,60 +73,60 @@ msgstr "Tar bort"
msgid "Cleanup"
msgstr "Rensar upp"
-#: ../cli.py:107
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "Kommando \"%s\" redan definierat"
-#: ../cli.py:119
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "Gör i ordning förråd"
-#: ../cli.py:130
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "Läser in förrådsmetadata från lokala filer"
-#: ../cli.py:193 ../utils.py:87
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "Konfigurationsfel: %s"
-#: ../cli.py:196 ../cli.py:1253 ../utils.py:90
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "Fel bland flaggor: %s"
-#: ../cli.py:225
+#: ../cli.py:223
#, python-format
msgid " Installed: %s-%s at %s"
msgstr " Installerade: %s-%s %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, python-format
msgid " Built : %s at %s"
msgstr " Byggde : %s %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, python-format
msgid " Committed: %s at %s"
msgstr " Verkställde : %s %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "Du måste ange något kommando"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "Diskbehov:\n"
-#: ../cli.py:313
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " Åtminstone %d MB behövs på filsystemet %s.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -133,64 +134,64 @@ msgstr ""
"Felsammandrag\n"
"-------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "Försöker köra transaktionen men det finns inget att göra. Avslutar."
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "Avslutar på användarens order"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "Hämtar paket:"
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "Fel när paket hämtades:\n"
-#: ../cli.py:420 ../yum/__init__.py:3854
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "Kör rpm_check_debug"
-#: ../cli.py:429 ../yum/__init__.py:3863
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "FEL Du behöver uppdatera rpm för att hantera:"
-#: ../cli.py:431 ../yum/__init__.py:3866
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "FEL med rpm_check_debug mot depsolve:"
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "RPM behöver uppdateras"
-#: ../cli.py:438
+#: ../cli.py:436
#, python-format
msgid "Please report this error in %s"
msgstr "Vänligen rapportera detta fel i %s"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "Kör transaktionstest"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "Avslutade transaktionstest"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "Transaktionskontrollfel:\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "Transaktionskontrollen lyckades"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "Kör transaktionen"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -198,79 +199,79 @@ msgstr ""
"Vägrar att automatiskt importera nycklar vid oövervakad körning.\n"
"Använd \"-y\" för att åsidosätta."
-#: ../cli.py:540 ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * Du kanske menade: "
-#: ../cli.py:557 ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "Paket %s%s%s tillgängliga, men inte installerade."
-#: ../cli.py:571 ../cli.py:602 ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, python-format
msgid "No package %s%s%s available."
msgstr "Inget paket %s%s%s tillgängligt."
-#: ../cli.py:607 ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "Paket att installera"
-#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741
-#: ../yumcommands.py:157
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "Inget att göra"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "%d paket noterade att uppdateras"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "Inga paket noterade att uppdateras"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "%d paket noterade att tas bort"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "Inga paket noterade att tas bort"
-#: ../cli.py:685
+#: ../cli.py:683
msgid "Package(s) to downgrade"
msgstr "Paket att nedgradera"
-#: ../cli.py:709
+#: ../cli.py:707
#, python-format
msgid " (from %s)"
msgstr " (från %s)"
-#: ../cli.py:711
+#: ../cli.py:709
#, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "Installerat paket %s%s%s%s inte tillgängligt."
-#: ../cli.py:718
+#: ../cli.py:716
msgid "Package(s) to reinstall"
msgstr "Paket att ominstallera"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "Inga paket angivna"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "Varning: Ingen matchning hittades för: %s"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "Inga matchningar hittades"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
@@ -280,108 +281,108 @@ msgstr ""
" Du kan använda \"%s*/%s%s\" och/eller \"%s*bin/%s%s\" för att få detta "
"beteende"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "Inga paket hittades för %s"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "Rensar upp allt"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "Rensar upp huvuden"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "Rensar upp paket"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "Rensar upp xml-metadata"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "Rensar upp databas-cache"
-#: ../cli.py:911
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr "Rensar upp expire-cache-metadata"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "Rensar upp insticksmoduler"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "Installerade grupper:"
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "Tillgängliga grupper:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "Klart"
-#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2560
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "Varning: Grupp %s finns inte."
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
"Inget paket i någon begärd grupp är tillgängligt för installation eller "
"uppdatering"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "%d paket att installera"
-#: ../cli.py:1012 ../yum/__init__.py:2572
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "Ingen grupp med namnet %s finns"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "Inget paket att ta bort från grupper"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "%d paket att ta bort"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "Paket %s är redan installerat, hoppar över"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "Kastar ojämförbart paket %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
"Ingen annat %s installerat, lägger till listan för potentiell installation"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "Insticksmodulsalternativ"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "Kommandoradsfel: %s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
@@ -392,257 +393,257 @@ msgstr ""
"\n"
"%s: flaggan %s behöver ett argument"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color tar en av: auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
msgid "show this help message and exit"
msgstr "visa detta hjälpmeddelande och avsluta"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "var tolerant vid fel"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "kör helt från cache, uppdatera inte cachen"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "konfigurationsfilens plats"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "maximal tid att vänta på kommandon"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "nivå på felsökningsutskrifter"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "visa dubletter, i förråd, i list-/search-kommandon"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "nivå på felutskrifter"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "tyst operation"
-#: ../cli.py:1323
+#: ../cli.py:1321
msgid "verbose operation"
msgstr "utförlig operation"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "svara ja på alla frågor"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "visa Yum-version och avsluta"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "ange installationsrot"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "aktivera ett eller flera förråd (jokrertecken tillåts)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "inaktivera ett eller flera förråd (jokertecken tillåts)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "uteslut paket via namn eller mönster"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "inaktivera uteslutningar från main, för ett förråd, eller för allt"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "aktivera bearbetning av utfasningar under uppdateringar"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "inaktivera Yum-insticksmoduler"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "inaktivera kontroll av gpg-signatur"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "inaktivera insticksmoduler efter namn"
-#: ../cli.py:1353
+#: ../cli.py:1351
msgid "enable plugins by name"
msgstr "aktivera insticksmoduler efter namn"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "hoppa över paket med problem vid beroendeupplösning"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "styr om färg skall användas"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jan"
msgstr "jan"
-#: ../output.py:303
+#: ../output.py:305
msgid "Feb"
msgstr "feb"
-#: ../output.py:303
+#: ../output.py:305
msgid "Mar"
msgstr "mar"
-#: ../output.py:303
+#: ../output.py:305
msgid "Apr"
msgstr "apr"
-#: ../output.py:303
+#: ../output.py:305
msgid "May"
msgstr "maj"
-#: ../output.py:303
+#: ../output.py:305
msgid "Jun"
msgstr "jun"
-#: ../output.py:304
+#: ../output.py:306
msgid "Jul"
msgstr "jul"
-#: ../output.py:304
+#: ../output.py:306
msgid "Aug"
msgstr "aug"
-#: ../output.py:304
+#: ../output.py:306
msgid "Sep"
msgstr "sep"
-#: ../output.py:304
+#: ../output.py:306
msgid "Oct"
msgstr "okt"
-#: ../output.py:304
+#: ../output.py:306
msgid "Nov"
msgstr "nov"
-#: ../output.py:304
+#: ../output.py:306
msgid "Dec"
msgstr "dec"
-#: ../output.py:314
+#: ../output.py:316
msgid "Trying other mirror."
msgstr "Försöker med en annan spegel."
-#: ../output.py:536
+#: ../output.py:538
#, python-format
msgid "Name : %s%s%s"
msgstr "Namn : %s%s%s"
-#: ../output.py:537
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr "Arkitektur : %s"
-#: ../output.py:539
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr "Epok : %s"
-#: ../output.py:540
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr "Version : %s"
-#: ../output.py:541
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr "Utgåva : %s"
-#: ../output.py:542
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr "Storlek : %s"
-#: ../output.py:543
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr "Förråd : %s"
-#: ../output.py:545
+#: ../output.py:547
#, python-format
msgid "From repo : %s"
msgstr "Från förråd: %s"
-#: ../output.py:547
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr "Verkställare: %s"
-#: ../output.py:548
+#: ../output.py:550
#, python-format
msgid "Committime : %s"
msgstr "Verkställt : %s"
-#: ../output.py:549
+#: ../output.py:551
#, python-format
msgid "Buildtime : %s"
msgstr "Byggt : %s"
-#: ../output.py:551
+#: ../output.py:553
#, python-format
msgid "Installtime: %s"
msgstr "Installerat: %s"
-#: ../output.py:552
+#: ../output.py:554
msgid "Summary : "
msgstr "Sammandrag : "
-#: ../output.py:554
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:555
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr "Licens : %s"
-#: ../output.py:556
+#: ../output.py:558
msgid "Description: "
msgstr "Beskrivning: "
-#: ../output.py:624
+#: ../output.py:626
msgid "y"
msgstr "j"
-#: ../output.py:624
+#: ../output.py:626
msgid "yes"
msgstr "ja"
-#: ../output.py:625
+#: ../output.py:627
msgid "n"
msgstr "n"
-#: ../output.py:625
+#: ../output.py:627
msgid "no"
msgstr "nej"
-#: ../output.py:629
+#: ../output.py:631
msgid "Is this ok [y/N]: "
msgstr "Är detta ok [j/N]: "
-#: ../output.py:720
+#: ../output.py:722
#, python-format
msgid ""
"\n"
@@ -651,141 +652,141 @@ msgstr ""
"\n"
"Grupp: %s"
-#: ../output.py:724
+#: ../output.py:726
#, python-format
msgid " Group-Id: %s"
msgstr " Grupp-id: %s"
-#: ../output.py:729
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr " Beskrivning: %s"
-#: ../output.py:731
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr " Obligatoriska paket:"
-#: ../output.py:732
+#: ../output.py:734
msgid " Default Packages:"
msgstr " Standardpaket:"
-#: ../output.py:733
+#: ../output.py:735
msgid " Optional Packages:"
msgstr " Valfria paket:"
-#: ../output.py:734
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr " Villkorliga paket:"
-#: ../output.py:754
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr "paket: %s"
-#: ../output.py:756
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr " Inga beroenden för detta paket"
-#: ../output.py:761
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr " beroende: %s"
-#: ../output.py:763
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr " Ej uppfyllt beroende"
-#: ../output.py:835
+#: ../output.py:837
#, python-format
msgid "Repo : %s"
msgstr "Förråd : %s"
-#: ../output.py:836
+#: ../output.py:838
msgid "Matched from:"
msgstr "Matchat från:"
-#: ../output.py:845
+#: ../output.py:847
msgid "Description : "
msgstr "Beskrivning : "
-#: ../output.py:848
+#: ../output.py:850
#, python-format
msgid "URL : %s"
msgstr "URL : %s"
-#: ../output.py:851
+#: ../output.py:853
#, python-format
msgid "License : %s"
msgstr "Licens : %s"
-#: ../output.py:854
+#: ../output.py:856
#, python-format
msgid "Filename : %s"
msgstr "Filnamn : %s"
-#: ../output.py:858
+#: ../output.py:860
msgid "Other : "
msgstr "Övrigt : "
-#: ../output.py:891
+#: ../output.py:893
msgid "There was an error calculating total download size"
msgstr "Ett fel uppstod vid beräkningen av total storlek att hämta"
-#: ../output.py:896
+#: ../output.py:898
#, python-format
msgid "Total size: %s"
msgstr "Total storlek: %s"
-#: ../output.py:899
+#: ../output.py:901
#, python-format
msgid "Total download size: %s"
msgstr "Total storlek att hämta: %s"
-#: ../output.py:940
+#: ../output.py:942
msgid "Reinstalling"
msgstr "Ominstallerar"
-#: ../output.py:941
+#: ../output.py:943
msgid "Downgrading"
msgstr "Nedgraderar"
-#: ../output.py:942
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr "Installerar på grund av beroenden"
-#: ../output.py:943
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr "Uppdaterar på grund av beroenden"
-#: ../output.py:944
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr "Tar bort på grund av beroenden"
-#: ../output.py:951 ../output.py:1063
+#: ../output.py:953 ../output.py:1065
msgid "Skipped (dependency problems)"
msgstr "Hoppas över (beroendeproblem)"
-#: ../output.py:974
+#: ../output.py:976
msgid "Package"
msgstr "Paket"
-#: ../output.py:974
+#: ../output.py:976
msgid "Arch"
msgstr "Ark"
-#: ../output.py:975
+#: ../output.py:977
msgid "Version"
msgstr "Version"
-#: ../output.py:975
+#: ../output.py:977
msgid "Repository"
msgstr "Förråd"
-#: ../output.py:976
+#: ../output.py:978
msgid "Size"
msgstr "Storl."
-#: ../output.py:988
+#: ../output.py:990
#, python-format
msgid ""
" replacing %s%s%s.%s %s\n"
@@ -794,7 +795,7 @@ msgstr ""
" ersätter %s%s%s.%s %s\n"
"\n"
-#: ../output.py:997
+#: ../output.py:999
#, python-format
msgid ""
"\n"
@@ -805,7 +806,7 @@ msgstr ""
"Transaktionssammanfattning\n"
"%s\n"
-#: ../output.py:1004
+#: ../output.py:1006
#, python-format
msgid ""
"Install %5.5s Package(s)\n"
@@ -814,7 +815,7 @@ msgstr ""
"Installerar %5.5s Paket\n"
"Uppdaterar %5.5s Paket\n"
-#: ../output.py:1013
+#: ../output.py:1015
#, python-format
msgid ""
"Remove %5.5s Package(s)\n"
@@ -825,32 +826,32 @@ msgstr ""
"Ominstallerar %5.5s Paket\n"
"Nedgraderar %5.5s Paket\n"
-#: ../output.py:1057
+#: ../output.py:1059
msgid "Removed"
msgstr "Borttagna"
-#: ../output.py:1058
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr "Borttagna beroenden"
-#: ../output.py:1060
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr "Installerade beroenden"
-#: ../output.py:1062
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr "Uppdaterade beroenden"
-#: ../output.py:1064
+#: ../output.py:1066
msgid "Replaced"
msgstr "Ersatte"
-#: ../output.py:1065
+#: ../output.py:1067
msgid "Failed"
msgstr "Misslyckade"
#. Delta between C-c's so we treat as exit
-#: ../output.py:1131
+#: ../output.py:1133
msgid "two"
msgstr "två"
@@ -858,7 +859,7 @@ msgstr "två"
#. Current download cancelled, interrupt (ctrl-c) again within two seconds
#. to exit.
#. Where "interupt (ctrl-c) again" and "two" are highlighted.
-#: ../output.py:1142
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
@@ -870,76 +871,256 @@ msgstr ""
" Aktuell nedladdning avbröts, %savbryt (ctrl-c) igen%s inom %s%s%s sekunder\n"
"för att avsluta.\n"
-#: ../output.py:1153
+#: ../output.py:1155
msgid "user interrupt"
msgstr "avbrott från användaren"
-#: ../output.py:1171
+#: ../output.py:1173
msgid "Total"
msgstr "Totalt"
-#: ../output.py:1186
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+#, fuzzy
+msgid "Not found given transaction ID"
+msgstr "Kör transaktionen"
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+#, fuzzy
+msgid "Transaction ID :"
+msgstr "Transaktionskontrollfel:\n"
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, fuzzy, python-format
+msgid "(%s seconds)"
+msgstr "%s sekunder (senast: %s)"
+
+#: ../output.py:1379
+#, fuzzy
+msgid "End time :"
+msgstr "Övrigt : "
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+#, fuzzy
+msgid "User :"
+msgstr "URL : %s"
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+#, fuzzy
+msgid "Aborted"
+msgstr "Låter utgå"
+
+#: ../output.py:1389
+#, fuzzy
+msgid "Failure:"
+msgstr "Misslyckade"
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+#, fuzzy
+msgid "Transaction performed with:"
+msgstr "Transaktionskontrollfel:\n"
+
+#: ../output.py:1405
+#, fuzzy
+msgid "Downgraded"
+msgstr "Nedgraderar"
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+#, fuzzy
+msgid "Packages Altered:"
+msgstr "Inga paket angivna"
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "Fel: %s"
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr "installeras"
-#: ../output.py:1187
+#: ../output.py:1525
msgid "updated"
msgstr "uppdateras"
-#: ../output.py:1188
+#: ../output.py:1526
msgid "obsoleted"
msgstr "fasas ut"
-#: ../output.py:1189
+#: ../output.py:1527
msgid "erased"
msgstr "raderas"
-#: ../output.py:1193
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> Paket %s.%s %s:%s-%s satt till att %s"
-#: ../output.py:1200
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> Kör transaktionskontroll"
-#: ../output.py:1205
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> Startar om beroendeupplösning med nya ändringar."
-#: ../output.py:1210
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> Avslutade beroendeupplösning"
-#: ../output.py:1215 ../output.py:1220
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> Bearbetar beroende: %s för paket: %s"
-#: ../output.py:1224
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> Ej upplöst beroende: %s"
-#: ../output.py:1230 ../output.py:1235
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> Bearbetar konflikt: %s står i konflikt med %s"
-#: ../output.py:1239
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> Fyller transaktionsmängden med valda paket. Var god dröj."
-#: ../output.py:1243
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> Hämtar huvud för %s för att paketera i transaktionsmängden."
-#: ../yumcommands.py:40
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+"\n"
+"\n"
+"Slutar efter att användaren avbröt"
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+"\n"
+"\n"
+"Slutar med brutet rör (pipe)"
+
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"\n"
+"%s"
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr "Klart!"
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr "Du måste vara root för att utföra detta kommando."
-#: ../yumcommands.py:47
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -970,335 +1151,335 @@ msgstr ""
"\n"
"För mer information, kontakta leverantören av din distribution eller paket.\n"
-#: ../yumcommands.py:67
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr "Fel: Behöver skicka en lista paket till %s"
-#: ../yumcommands.py:73
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr "Fel: Behöver något att matcha emot"
-#: ../yumcommands.py:79
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr "Fel: Behöver en grupp eller lista av grupper"
-#: ../yumcommands.py:88
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr "Fel: clean behöver ett argument: %s"
-#: ../yumcommands.py:93
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr "Fel: felaktigt argument till clean: %r"
-#: ../yumcommands.py:106
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr "Inget argument till skalet"
-#: ../yumcommands.py:108
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr "Filnamn skickat till skalet: %s"
-#: ../yumcommands.py:112
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr "Filen %s som gavs som ett argument till skalet finns inte."
-#: ../yumcommands.py:118
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr "Fel: mer än en fil angiven som argument till skalet."
-#: ../yumcommands.py:167
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr "PAKET..."
-#: ../yumcommands.py:170
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr "Installera ett eller flera paket på ditt system"
-#: ../yumcommands.py:178
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr "Förbereder installationsprocessen"
-#: ../yumcommands.py:189
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr "[PAKET...]"
-#: ../yumcommands.py:192
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr "Uppdatera ett eller flera paket på ditt system"
-#: ../yumcommands.py:199
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr "Förbereder uppdateringsprocessen"
-#: ../yumcommands.py:244
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr "Visa detaljer om ett paket eller en grupp paket"
-#: ../yumcommands.py:293
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr "Installerade paket"
-#: ../yumcommands.py:301
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr "Tillgängliga paket"
-#: ../yumcommands.py:305
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr "Extra paket"
-#: ../yumcommands.py:309
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr "Uppdaterade paket"
#. This only happens in verbose mode
-#: ../yumcommands.py:317 ../yumcommands.py:324 ../yumcommands.py:600
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "Fasar ut paket"
-#: ../yumcommands.py:326
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr "Nyligen tillagda paket"
-#: ../yumcommands.py:333
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr "Inga matchande paket att lista"
-#: ../yumcommands.py:347
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr "Lista ett paket eller en grupp paket"
-#: ../yumcommands.py:359
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr "Ta bort ett eller flera paket från ditt system"
-#: ../yumcommands.py:366
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr "Förbereder processen att ta bort"
-#: ../yumcommands.py:380
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr "Förbereder grupprocessen"
-#: ../yumcommands.py:386
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr "Inga grupper att köra kommandot på"
-#: ../yumcommands.py:399
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr "Lista tillgängliga paketgrupper"
-#: ../yumcommands.py:416
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr "Installera paketen i en grupp på ditt system"
-#: ../yumcommands.py:438
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr "Ta bort paketen in en grupp från ditt system"
-#: ../yumcommands.py:465
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr "Visa detaljer om en paketgrupp"
-#: ../yumcommands.py:489
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr "Generera metadata-cache:n"
-#: ../yumcommands.py:495
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr "Skapar cache-filer för alla metadatafiler."
-#: ../yumcommands.py:496
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr "Detta kan ta ett tag beroende på datorns fart"
-#: ../yumcommands.py:517
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr "Metadata-cache skapad"
-#: ../yumcommands.py:531
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr "Ta bort cache:ade data"
-#: ../yumcommands.py:551
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr "Ta reda på vilka paket som tillhandahåller det angivna värdet"
-#: ../yumcommands.py:571
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr "Leta efter tillgängliga paketuppdateringar"
-#: ../yumcommands.py:620
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "Sök i paketdetaljer efter den angivna strängen"
-#: ../yumcommands.py:626
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "Söker paket: "
-#: ../yumcommands.py:643
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "Uppdatera paket med hänsyn tagen till utfasningar"
-#: ../yumcommands.py:651
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "Förbereder uppgraderingsprocessen"
-#: ../yumcommands.py:665
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "Installera en lokal RPM"
-#: ../yumcommands.py:673
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "Förbereder den lokala paketprocessen"
-#: ../yumcommands.py:692
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "Avgör vilket paket som tillhandahåller ett angivet beroende"
-#: ../yumcommands.py:695
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "Söker i paketen efter beroende:"
-#: ../yumcommands.py:709
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "Kör ett interactivt yum-skal"
-#: ../yumcommands.py:715
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "Förbereder ett yum-skal"
-#: ../yumcommands.py:733
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "Lista ett pakets beroenden"
-#: ../yumcommands.py:739
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "Letar efter beroenden: "
-#: ../yumcommands.py:755
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "Visa konfigurerade programvaruförråd"
-#: ../yumcommands.py:803 ../yumcommands.py:804
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "aktivt"
-#: ../yumcommands.py:812 ../yumcommands.py:813
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "inaktivt"
-#: ../yumcommands.py:827
+#: ../yumcommands.py:834
msgid "Repo-id : "
msgstr "Förråds-id : "
-#: ../yumcommands.py:828
+#: ../yumcommands.py:835
msgid "Repo-name : "
msgstr "Förrådsnamn : "
-#: ../yumcommands.py:829
+#: ../yumcommands.py:836
msgid "Repo-status : "
msgstr "Förrådsstatus : "
-#: ../yumcommands.py:831
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr "Förrådsversion : "
-#: ../yumcommands.py:835
+#: ../yumcommands.py:842
msgid "Repo-tags : "
msgstr "Förrådstaggar : "
-#: ../yumcommands.py:841
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr "Förråds-distro-taggar: "
-#: ../yumcommands.py:846
+#: ../yumcommands.py:853
msgid "Repo-updated : "
msgstr "Förråd uppdaterat: "
-#: ../yumcommands.py:848
+#: ../yumcommands.py:855
msgid "Repo-pkgs : "
msgstr "Förrådspaket : "
-#: ../yumcommands.py:849
+#: ../yumcommands.py:856
msgid "Repo-size : "
msgstr "Förrådstorlek : "
-#: ../yumcommands.py:856
+#: ../yumcommands.py:863
msgid "Repo-baseurl : "
msgstr "Förrådsbasurl : "
-#: ../yumcommands.py:864
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr "Förrådsmetalänk : "
-#: ../yumcommands.py:868
+#: ../yumcommands.py:875
msgid " Updated : "
msgstr " Uppdaterat :"
-#: ../yumcommands.py:871
+#: ../yumcommands.py:878
msgid "Repo-mirrors : "
msgstr "Förrådspeglar : "
-#: ../yumcommands.py:875 ../yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr "Okänd"
-#: ../yumcommands.py:881
+#: ../yumcommands.py:888
#, python-format
msgid "Never (last: %s)"
msgstr "Aldrig (senast: %s)"
-#: ../yumcommands.py:883
+#: ../yumcommands.py:890
#, python-format
msgid "Instant (last: %s)"
msgstr "Omedelbart (senast: %s)"
-#: ../yumcommands.py:886
+#: ../yumcommands.py:893
#, python-format
msgid "%s second(s) (last: %s)"
msgstr "%s sekunder (senast: %s)"
-#: ../yumcommands.py:888
+#: ../yumcommands.py:895
msgid "Repo-expire : "
msgstr "Förråd går ut : "
-#: ../yumcommands.py:891
+#: ../yumcommands.py:898
msgid "Repo-exclude : "
msgstr "Förråd utesluter : "
-#: ../yumcommands.py:895
+#: ../yumcommands.py:902
msgid "Repo-include : "
msgstr "Förråd inkluderar: "
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:905 ../yumcommands.py:931
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "förråds-id"
-#: ../yumcommands.py:919 ../yumcommands.py:920 ../yumcommands.py:934
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "status"
-#: ../yumcommands.py:932
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "förrådsnamn"
-#: ../yumcommands.py:958
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "Visa ett hjälpsamt meddelande om användning"
-#: ../yumcommands.py:992
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "Ingen hjälp tillgänglig för %s"
-#: ../yumcommands.py:997
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
@@ -1308,7 +1489,7 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:999
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
@@ -1318,61 +1499,66 @@ msgstr ""
"\n"
"alias: "
-#: ../yumcommands.py:1027
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "Förbereder ominstallationsprocessen"
-#: ../yumcommands.py:1035
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "ominstallera ett paket"
-#: ../yumcommands.py:1053
+#: ../yumcommands.py:1060
msgid "Setting up Downgrade Process"
msgstr "Förbereder nedgraderingsprocessen"
-#: ../yumcommands.py:1060
+#: ../yumcommands.py:1067
msgid "downgrade a package"
msgstr "nedgradera ett paket"
-#: ../yumcommands.py:1074
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr "Visa en version för maskinen och/eller tillgängliga förråd."
-#: ../yumcommands.py:1101
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+#, fuzzy
+msgid " Group :"
+msgstr " Grupp-id: %s"
+
+#: ../yumcommands.py:1122
+#, fuzzy
+msgid " Packages:"
+msgstr "Paket"
+
+#: ../yumcommands.py:1152
msgid "Installed:"
msgstr "Installerade:"
-#: ../yumcommands.py:1110
+#: ../yumcommands.py:1157
+#, fuzzy
+msgid "Group-Installed:"
+msgstr "Installerade:"
+
+#: ../yumcommands.py:1166
msgid "Available:"
msgstr "Tillgängliga:"
-#: ../yummain.py:42
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
-msgstr ""
-"\n"
-"\n"
-"Slutar efter att användaren avbröt"
+#: ../yumcommands.py:1172
+#, fuzzy
+msgid "Group-Available:"
+msgstr "Tillgängliga:"
-#: ../yummain.py:48
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
msgstr ""
-"\n"
-"\n"
-"Slutar med brutet rör (pipe)"
-#: ../yummain.py:50
+#: ../yumcommands.py:1239
#, python-format
-msgid ""
-"\n"
-"\n"
-"%s"
-msgstr "\n\n%s"
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
#: ../yummain.py:128
msgid "Running"
@@ -1462,11 +1648,7 @@ msgstr ""
"\n"
"Beroenden upplösta"
-#: ../yummain.py:273
-msgid "Complete!"
-msgstr "Klart!"
-
-#: ../yummain.py:320
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1476,198 +1658,198 @@ msgstr ""
"\n"
"Slutar efter att användaren avbröt."
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "Förbereder transaktionsmängder före konfigurationsklass är uppe"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "Ogiltig tsflag i konfigurationsfil: %s"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "Söker pkgSack efter beroende: %s"
-#: ../yum/depsolve.py:183
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "Potentiell match av %s från %s"
-#: ../yum/depsolve.py:191
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "Matchade %s mot behov från %s"
-#: ../yum/depsolve.py:232
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "Medlem: %s"
-#: ../yum/depsolve.py:246 ../yum/depsolve.py:756
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s konverterad till att installera"
-#: ../yum/depsolve.py:253
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "Lägger till paket %s i läge %s"
-#: ../yum/depsolve.py:263
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "Tar bort paket %s"
-#: ../yum/depsolve.py:285
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s behöver: %s"
-#: ../yum/depsolve.py:343
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "Nödvändigt behov har redan slagits upp, fuskar"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "Nödvändigt behov är inte ett paketnamn. Slår upp: %s"
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr "Potentiell tillhandahållare: %s"
-#: ../yum/depsolve.py:383
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "Läget är %s för tillhandahållare av %s: %s"
-#: ../yum/depsolve.py:387
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "Läge för paket som tillhandahåller %s: %s"
-#: ../yum/depsolve.py:391
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "TSINFO: paket %s behöver %s noteras att raderas"
-#: ../yum/depsolve.py:404
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "TSINFO: Fasar ut %s med %s för att lösa upp beroenden."
-#: ../yum/depsolve.py:407
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "TSINFO: Uppdaterar %s för att lösa upp beroenden"
-#: ../yum/depsolve.py:415
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "Hittar ingen uppdateringsväg för beroende för: %s"
-#: ../yum/depsolve.py:425
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "Ej upplösbart behov %s för %s"
-#: ../yum/depsolve.py:448
+#: ../yum/depsolve.py:440
#, python-format
msgid "Quick matched %s to require for %s"
msgstr "Snabb matcning av %s mot behov för %s"
#. is it already installed?
-#: ../yum/depsolve.py:490
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
"%s finns bland tillhandahållande paket men det är redan installerat, tar "
"bort."
-#: ../yum/depsolve.py:506
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "Potentiellt upplösande paket %s har nyare instans i ts."
-#: ../yum/depsolve.py:517
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "Potentiellt upplösande paket %s har nyare instans installerad."
-#: ../yum/depsolve.py:525 ../yum/depsolve.py:571
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "Saknat beroende: %s behövs av paketet %s"
-#: ../yum/depsolve.py:538
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s är redan i ts, hoppar över denna"
-#: ../yum/depsolve.py:581
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "TSINFO: Noterar %s som en uppdatering av %s"
-#: ../yum/depsolve.py:589
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "TSINFO: Noterar %s som en installation av %s"
-#: ../yum/depsolve.py:692 ../yum/depsolve.py:774
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr "Klart - tom transaktion"
-#: ../yum/depsolve.py:731 ../yum/depsolve.py:746
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr "Startar om slingan"
-#: ../yum/depsolve.py:762
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr "Beroendeprocessen avslutas"
-#: ../yum/depsolve.py:768
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr "%s från %s har problem att lösa beroenden"
-#: ../yum/depsolve.py:775
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr "Klart - beroenden upplösta"
-#: ../yum/depsolve.py:789
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr "Kontrollerar beroenden för %s"
-#: ../yum/depsolve.py:872
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr "letar efter %s som ett behov för %s"
-#: ../yum/depsolve.py:1014
+#: ../yum/depsolve.py:1007
#, python-format
msgid "Running compare_providers() for %s"
msgstr "Kör compare_providers() för %s"
-#: ../yum/depsolve.py:1048 ../yum/depsolve.py:1054
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr "bättre arkitektur i po %s"
-#: ../yum/depsolve.py:1140
+#: ../yum/depsolve.py:1142
#, python-format
msgid "%s obsoletes %s"
msgstr "%s fasar ut %s"
-#: ../yum/depsolve.py:1152
+#: ../yum/depsolve.py:1154
#, python-format
msgid ""
"archdist compared %s to %s on %s\n"
@@ -1676,103 +1858,103 @@ msgstr ""
"arkitekturavstånd jämför %s med %s på %s\n"
" Vinnare: %s"
-#: ../yum/depsolve.py:1159
+#: ../yum/depsolve.py:1161
#, python-format
msgid "common sourcerpm %s and %s"
msgstr "samma käll-rpm %s och %s"
-#: ../yum/depsolve.py:1165
+#: ../yum/depsolve.py:1167
#, python-format
msgid "common prefix of %s between %s and %s"
msgstr "gemensamt prefix för %s mellan %s och %s"
-#: ../yum/depsolve.py:1173
+#: ../yum/depsolve.py:1175
#, python-format
msgid "Best Order: %s"
msgstr "Bästa ordning: %s"
-#: ../yum/__init__.py:180
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr "doConfigSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/__init__.py:401
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr "Förrådet %r saknar namn i konfigurationen, använder id"
-#: ../yum/__init__.py:439
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr "insticksmoduler redan initierade"
-#: ../yum/__init__.py:446
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr "doRpmDBSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/__init__.py:457
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr "Läser lokal RPMDB"
-#: ../yum/__init__.py:478
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr "doRepoSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/__init__.py:498
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr "doSackSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/__init__.py:528
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr "Förbereder paketsäckar"
-#: ../yum/__init__.py:573
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr "förrådsobjekt för förrådet %s saknar en _resetSack-metod\n"
-#: ../yum/__init__.py:574
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr "därför kan inte detta förråd återställas.\n"
-#: ../yum/__init__.py:579
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr "doUpdateSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/__init__.py:591
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr "Bygger uppdateringsobjekt"
-#: ../yum/__init__.py:626
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr "doGroupSetup() kommer att försvinna i en framtida version av Yum.\n"
-#: ../yum/__init__.py:651
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr "Hämtar gruppmetadata"
-#: ../yum/__init__.py:677
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr "Lägger till gruppfil från förrådet: %s"
-#: ../yum/__init__.py:686
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr "Kunde inte lägga till gruppfil för förrådet: %s - %s"
-#: ../yum/__init__.py:692
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr "Inga grupper tillgängliga i något förråd"
-#: ../yum/__init__.py:742
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr "Importerar ytterligare fillisteinformation"
-#: ../yum/__init__.py:756
+#: ../yum/__init__.py:777
#, python-format
msgid "The program %s%s%s is found in the yum-utils package."
msgstr "Programmet %s%s%s finns i paketet yum-utils."
-#: ../yum/__init__.py:764
+#: ../yum/__init__.py:785
msgid ""
"There are unfinished transactions remaining. You might consider running yum-"
"complete-transaction first to finish them."
@@ -1780,17 +1962,17 @@ msgstr ""
"Det finns oavslutade transaktioner kvar. Du kan överväga att köra "
"yumcomplete-transaction först för att avsluta dem."
-#: ../yum/__init__.py:832
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr "Hoppa-över-trasiga runda %i"
-#: ../yum/__init__.py:884
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr "Hoppa-över-trasiga tog %i rundor "
-#: ../yum/__init__.py:885
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
@@ -1798,72 +1980,78 @@ msgstr ""
"\n"
"Paket hoppades över på grund av beroendeproblem:"
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s från %s"
-#: ../yum/__init__.py:1027
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
"Varning: skript- eller annat icke ödesdigert fel inträffade under "
"transaktionen."
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "Kunde inte ta bort transaktionsfilen %s"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1071
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr "%s skulle installerats men gjordes det inte!"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1110
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr "%s skulle tagits bort men det gjordes inte!"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1225
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "Kan inte kontrollera om PID %s är aktiv"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1229
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "Existerande lås %s: en annan kopia kör som pid %s."
-#: ../yum/__init__.py:1306
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "Paketet matchar inte avsedd det avsett att laddas ner"
-#: ../yum/__init__.py:1321
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "Kunde inte utföra kontrollsummering"
-#: ../yum/__init__.py:1324
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "Paketet stämmer inte med kontrollsumman"
-#: ../yum/__init__.py:1366
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "paketet misslyckas med kontrollsumman men cachning är aktiverat för %s"
-#: ../yum/__init__.py:1369 ../yum/__init__.py:1398
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "använder lokal kopia av %s"
-#: ../yum/__init__.py:1410
+#: ../yum/__init__.py:1477
#, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -1874,11 +2062,11 @@ msgstr ""
" * fritt %s\n"
" * behovet %s"
-#: ../yum/__init__.py:1459
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "Huvudet är inte komplett."
-#: ../yum/__init__.py:1496
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
@@ -1886,64 +2074,64 @@ msgstr ""
"Huvudet finns inte i den lokala cachen och endast-cache-läget är aktiverat. "
"Kan inte hämta %s"
-#: ../yum/__init__.py:1551
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "Den publika nyckeln för %s är inte installerad"
-#: ../yum/__init__.py:1555
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "Problem att öppna paketet %s"
-#: ../yum/__init__.py:1563
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "Den publika nyckeln för %s är inte betrodd"
-#: ../yum/__init__.py:1567
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "Paket %s är inte signerat"
-#: ../yum/__init__.py:1605
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "Det går inte att ta bort %s"
-#: ../yum/__init__.py:1609
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s borttaget"
# Första %s blir ett oöversatt engelskt ord.
# Felrapporterat: http://yum.baseurl.org/ticket/41
-#: ../yum/__init__.py:1645
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "Det går inte att ta bort %s-filen %s"
-#: ../yum/__init__.py:1649
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s-filen %s borttagen"
-#: ../yum/__init__.py:1651
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s-filer borttagna"
-#: ../yum/__init__.py:1720
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "Mer än en identisk matchning i säcken för %s"
-#: ../yum/__init__.py:1726
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "Ingenting matchar %s.%s %s:%s-%s från uppdateringarna"
-#: ../yum/__init__.py:1959
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
@@ -1951,183 +2139,181 @@ msgstr ""
"searchPackages() kommer att försvinna i en framtida version av "
"Yum. Använd searchGenerator() istället. \n"
-#: ../yum/__init__.py:2001
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "Söker i %d paket"
-#: ../yum/__init__.py:2005
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "söker i paketet %s"
-#: ../yum/__init__.py:2017
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "söker i filposter"
-#: ../yum/__init__.py:2024
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "söker i tillhandahållandeposter"
-#: ../yum/__init__.py:2057
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "Tillhandahållandematchning: %s"
-#: ../yum/__init__.py:2106
+#: ../yum/__init__.py:2170
msgid "No group data available for configured repositories"
msgstr "Inga gruppdata är tillgängliga för de konfigurerade förråden"
-#: ../yum/__init__.py:2137 ../yum/__init__.py:2156 ../yum/__init__.py:2187
-#: ../yum/__init__.py:2193 ../yum/__init__.py:2272 ../yum/__init__.py:2276
-#: ../yum/__init__.py:2586
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "Det finns ingen grupp med namnet %s"
-#: ../yum/__init__.py:2168 ../yum/__init__.py:2289
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "paket %s noterades inte i gruppen %s"
-#: ../yum/__init__.py:2215
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "Lägger till paket %s från grupp %s"
-#: ../yum/__init__.py:2219
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "Inget paket med namnet %s är tillgängligt för installation"
-#: ../yum/__init__.py:2316
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "Pakettupel %s fanns inte i paketsäcken"
-#: ../yum/__init__.py:2330
-msgid ""
-"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
-msgstr ""
-"getInstalledPackageObject() kommer att försvinna, använd self.rpmdb."
-"searchPkgTuple().\n"
+#: ../yum/__init__.py:2399
+#, fuzzy, python-format
+msgid "Package tuple %s could not be found in rpmdb"
+msgstr "Pakettupel %s fanns inte i paketsäcken"
-#: ../yum/__init__.py:2386 ../yum/__init__.py:2436
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "Ogiltig versionsflagga"
-#: ../yum/__init__.py:2406 ../yum/__init__.py:2411
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "Inga paket hittades för %s"
-#: ../yum/__init__.py:2627
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "Paketobjektet var inte en paketobjektinstans"
-#: ../yum/__init__.py:2631
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "Inget angivet att installeras"
-#: ../yum/__init__.py:2647 ../yum/__init__.py:3411
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
"Kontrollerar virtuella tillhandahållanden eller filtillhandahållanden för %s"
-#: ../yum/__init__.py:2653 ../yum/__init__.py:2960 ../yum/__init__.py:3127
-#: ../yum/__init__.py:3417
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "Ingen matchning för argument: %s"
-#: ../yum/__init__.py:2729
+#: ../yum/__init__.py:2798
#, python-format
msgid "Package %s installed and not available"
msgstr "Paket %s installerat och inte tillgänligt"
-#: ../yum/__init__.py:2732
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "Inga paket tillgängliga att installera"
-#: ../yum/__init__.py:2744
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "Paket: %s - redan i transaktionsmängden"
-#: ../yum/__init__.py:2770
+#: ../yum/__init__.py:2839
#, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "Paket %s fasas ut av %s, som redan är installerat"
-#: ../yum/__init__.py:2773
+#: ../yum/__init__.py:2842
#, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "Paket %s fasas ut av %s, försöker installera %s istället"
-#: ../yum/__init__.py:2781
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "Paket %s är redan installerast och senaste version"
-#: ../yum/__init__.py:2795
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "Paket som matchar %s är redan installerat. Letar efter uppdatering."
#. update everything (the easy case)
-#: ../yum/__init__.py:2889
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "Uppdaterar allt"
-#: ../yum/__init__.py:2910 ../yum/__init__.py:3025 ../yum/__init__.py:3054
-#: ../yum/__init__.py:3081
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "Uppdaterar inte paket som redan är utfasade: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:2945 ../yum/__init__.py:3124
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3016
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "Paketet är redan utfasat: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3049
+#: ../yum/__init__.py:3124
#, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "Uppdaterar inte paket som är utfasade: %s"
-#: ../yum/__init__.py:3058 ../yum/__init__.py:3085
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "Uppdaterar inte paket som redan är uppdaterat: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3140
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "Inget paket matchar att tas bort"
-#: ../yum/__init__.py:3173 ../yum/__init__.py:3277 ../yum/__init__.py:3366
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "Det går inte att öppna filen: %s. Hoppar över."
-#: ../yum/__init__.py:3176 ../yum/__init__.py:3280 ../yum/__init__.py:3369
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "Undersöker %s: %s"
-#: ../yum/__init__.py:3184 ../yum/__init__.py:3283 ../yum/__init__.py:3372
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
"Kan inte lägga till paket %s till transaktionen. Inte en kompatibel "
"arkitektur: %s"
-#: ../yum/__init__.py:3192
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
@@ -2136,93 +2322,98 @@ msgstr ""
"Paket %s är inte installerat, kan inte uppdatera det. Kör yum install för "
"att installera det istället."
-#: ../yum/__init__.py:3227 ../yum/__init__.py:3294 ../yum/__init__.py:3383
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "Utesluter %s"
-#: ../yum/__init__.py:3232
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "Noterar %s för installation"
-#: ../yum/__init__.py:3238
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "Noterar %s som en uppdatering av %s"
-#: ../yum/__init__.py:3245
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s: uppdaterar inte ett installerat paket."
-#: ../yum/__init__.py:3313
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "Problem att ominstallera: inget paket matchades att tas bort"
-#: ../yum/__init__.py:3326 ../yum/__init__.py:3444
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "Paket %s tillåts multipla installationer, hoppar över"
-#: ../yum/__init__.py:3347
+#: ../yum/__init__.py:3413
#, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr "Problem att ominstallera: inget paket %s matchades att installera"
-#: ../yum/__init__.py:3436
+#: ../yum/__init__.py:3515
msgid "No package(s) available to downgrade"
msgstr "Inga paket tillgängliga att nedgradera"
-#: ../yum/__init__.py:3480
+#: ../yum/__init__.py:3559
#, python-format
msgid "No Match for available package: %s"
msgstr "Ingen matchning för tillgängliga paket: %s"
-#: ../yum/__init__.py:3486
+#: ../yum/__init__.py:3565
#, fuzzy, python-format
msgid "Only Upgrade available on package: %s"
msgstr "Endast uppdatering tillgängliga för paket: %s"
-#: ../yum/__init__.py:3545
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, fuzzy, python-format
+msgid "Failed to downgrade: %s"
+msgstr "Paket att nedgradera"
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "Hämtar GPG-nyckel från %s"
-#: ../yum/__init__.py:3565
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "Hämtandet av GPG-nyckeln misslyckades: "
-#: ../yum/__init__.py:3576
+#: ../yum/__init__.py:3735
#, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "GPG-nyckeltolkning misslyckades: nyckeln har inte värde %s"
-#: ../yum/__init__.py:3608
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "GPG-nyckel vid %s (0x%s) är redan installerad"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3613 ../yum/__init__.py:3675
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "Importerar GPG-nyckel 0x%s \"%s\" från %s"
-#: ../yum/__init__.py:3630
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "Installerar inte nyckeln"
-#: ../yum/__init__.py:3636
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "Nyckelimport misslyckades (kod %d)"
-#: ../yum/__init__.py:3637 ../yum/__init__.py:3696
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "Nyckelimport lyckades"
-#: ../yum/__init__.py:3642 ../yum/__init__.py:3701
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -2233,38 +2424,38 @@ msgstr ""
"inte korrekta för detta paket.\n"
"Kontrollera att de rätta nyckel-URL:erna är konfigurerade för detta förråd."
-#: ../yum/__init__.py:3651
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "Import av nycklar hjälpte inte, fel nycklar?"
-#: ../yum/__init__.py:3670
+#: ../yum/__init__.py:3829
#, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG-nyckel vid %s (0x%s) är redan importerad"
-#: ../yum/__init__.py:3690
+#: ../yum/__init__.py:3849
#, python-format
msgid "Not installing key for repo %s"
msgstr "Installerar inte nyckel för förråd %s"
-#: ../yum/__init__.py:3695
+#: ../yum/__init__.py:3854
msgid "Key import failed"
msgstr "Nyckelimport misslyckades"
-#: ../yum/__init__.py:3816
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "Kan inte hitta en lämplig spegel."
-#: ../yum/__init__.py:3818
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "Fel uppstod när paket hämtades."
-#: ../yum/__init__.py:3868
+#: ../yum/__init__.py:4028
#, python-format
msgid "Please report this error at %s"
msgstr "Rapportera gärna detta fel till %s"
-#: ../yum/__init__.py:3892
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "Transaktionstestfel: "
@@ -2324,7 +2515,7 @@ msgstr "Konfigurationsfilen %s finns inte"
msgid "Unable to find configuration file for plugin %s"
msgstr "Kan inte hitta konfigurationsfil för insticksmodulen %s"
-#: ../yum/plugins.py:497
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr "registrering av kommandon stöds inte"
@@ -2361,3 +2552,10 @@ msgstr "Trasigt huvud %s"
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr "Fel när rpm %s öppnades - fel %s"
+
+#~ msgid ""
+#~ "getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple"
+#~ "().\n"
+#~ msgstr ""
+#~ "getInstalledPackageObject() kommer att försvinna, använd self.rpmdb."
+#~ "searchPkgTuple().\n"
diff --git a/po/yum.pot b/po/yum.pot
index 9e01e13..eaeb80c 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 11:29+0100\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,31 +16,33 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../callback.py:48 ../output.py:512
+#: ../callback.py:48 ../output.py:940 ../yum/rpmtrans.py:71
msgid "Updating"
msgstr ""
-#: ../callback.py:49
+#: ../callback.py:49 ../yum/rpmtrans.py:72
msgid "Erasing"
msgstr ""
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:939
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
msgid "Installing"
msgstr ""
-#: ../callback.py:52 ../callback.py:58
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
msgid "Obsoleted"
msgstr ""
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr ""
-#: ../callback.py:55
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr ""
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
+#: ../output.py:1395
msgid "Installed"
msgstr ""
@@ -62,688 +64,1015 @@ msgstr ""
msgid "Erased: %s"
msgstr ""
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:941
msgid "Removing"
msgstr ""
-#: ../callback.py:219
+#: ../callback.py:219 ../yum/rpmtrans.py:77
msgid "Cleanup"
msgstr ""
-#: ../cli.py:103
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr ""
-#: ../cli.py:115
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr ""
-#: ../cli.py:126
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr ""
-#: ../cli.py:183 ../utils.py:72
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr ""
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr ""
-#: ../cli.py:229
+#: ../cli.py:223
+#, python-format
+msgid " Installed: %s-%s at %s"
+msgstr ""
+
+#: ../cli.py:225
+#, python-format
+msgid " Built : %s at %s"
+msgstr ""
+
+#: ../cli.py:227
+#, python-format
+msgid " Committed: %s at %s"
+msgstr ""
+
+#: ../cli.py:266
msgid "You need to give some command"
msgstr ""
-#: ../cli.py:271
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr ""
-#: ../cli.py:273
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr ""
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:278
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
msgstr ""
-#: ../cli.py:317
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr ""
-#: ../cli.py:347
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr ""
-#: ../cli.py:351
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr ""
-#: ../cli.py:356
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr ""
-#: ../cli.py:370 ../yum/__init__.py:2746
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr ""
-#: ../cli.py:373 ../yum/__init__.py:2749
+#: ../cli.py:427 ../yum/__init__.py:4023
+msgid "ERROR You need to update rpm to handle:"
+msgstr ""
+
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr ""
-#: ../cli.py:377 ../yum/__init__.py:2751
-msgid "Please report this error in bugzilla"
+#: ../cli.py:435
+msgid "RPM needs to be updated"
msgstr ""
-#: ../cli.py:383
+#: ../cli.py:436
+#, python-format
+msgid "Please report this error in %s"
+msgstr ""
+
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr ""
-#: ../cli.py:399
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr ""
-#: ../cli.py:401
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr ""
-#: ../cli.py:408
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr ""
-#: ../cli.py:429
+#: ../cli.py:489
msgid "Running Transaction"
msgstr ""
-#: ../cli.py:459
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
msgstr ""
-#: ../cli.py:491
-msgid "Parsing package install arguments"
+#: ../cli.py:538 ../cli.py:572
+msgid " * Maybe you meant: "
msgstr ""
-#: ../cli.py:501
+#: ../cli.py:555 ../cli.py:563
#, python-format
-msgid "No package %s available."
+msgid "Package(s) %s%s%s available, but not installed."
msgstr ""
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
+#, python-format
+msgid "No package %s%s%s available."
+msgstr ""
+
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr ""
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
+#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr ""
-#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
-#: ../yum/__init__.py:2340
+#: ../cli.py:639
#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+msgid "%d packages marked for Update"
msgstr ""
-#: ../cli.py:568
-#, python-format
-msgid "Could not find update match for %s"
+#: ../cli.py:642
+msgid "No Packages marked for Update"
msgstr ""
-#: ../cli.py:580
+#: ../cli.py:656
#, python-format
-msgid "%d packages marked for Update"
+msgid "%d packages marked for removal"
msgstr ""
-#: ../cli.py:583
-msgid "No Packages marked for Update"
+#: ../cli.py:659
+msgid "No Packages marked for removal"
msgstr ""
-#: ../cli.py:599
+#: ../cli.py:683
+msgid "Package(s) to downgrade"
+msgstr ""
+
+#: ../cli.py:707
#, python-format
-msgid "%d packages marked for removal"
+msgid " (from %s)"
msgstr ""
-#: ../cli.py:602
-msgid "No Packages marked for removal"
+#: ../cli.py:709
+#, python-format
+msgid "Installed package %s%s%s%s not available."
msgstr ""
-#: ../cli.py:614
-msgid "No Packages Provided"
+#: ../cli.py:716
+msgid "Package(s) to reinstall"
msgstr ""
-#: ../cli.py:654
-msgid "Matching packages for package list to user args"
+#: ../cli.py:729
+msgid "No Packages Provided"
msgstr ""
-#: ../cli.py:701
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr ""
-#: ../cli.py:704
+#: ../cli.py:816
msgid "No Matches found"
msgstr ""
-#: ../cli.py:745
+#: ../cli.py:855
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr ""
-#: ../cli.py:757
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr ""
-#: ../cli.py:771
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr ""
-#: ../cli.py:774
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr ""
-#: ../cli.py:777
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr ""
-#: ../cli.py:780
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr ""
-#: ../cli.py:783
+#: ../cli.py:909
msgid "Cleaning up expire-cache metadata"
msgstr ""
-#: ../cli.py:786
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr ""
-#: ../cli.py:807
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr ""
-#: ../cli.py:814
+#: ../cli.py:949
msgid "Available Groups:"
msgstr ""
-#: ../cli.py:820
+#: ../cli.py:959
msgid "Done"
msgstr ""
-#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr ""
-#: ../cli.py:853
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr ""
-#: ../cli.py:855
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr ""
-#: ../cli.py:865
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr ""
-#: ../cli.py:871
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr ""
-#: ../cli.py:873
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr ""
-#: ../cli.py:915
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr ""
-#: ../cli.py:926
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr ""
#. we've not got any installed that match n or n+a
-#: ../cli.py:952
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr ""
-#: ../cli.py:971
+#: ../cli.py:1117
+msgid "Plugin Options"
+msgstr ""
+
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr ""
-#: ../cli.py:1101
+#: ../cli.py:1138
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+
+#: ../cli.py:1191
+msgid "--color takes one of: auto, always, never"
+msgstr ""
+
+#: ../cli.py:1298
+msgid "show this help message and exit"
+msgstr ""
+
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr ""
-#: ../cli.py:1103
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr ""
-#: ../cli.py:1105
+#: ../cli.py:1306
msgid "config file location"
msgstr ""
-#: ../cli.py:1107
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr ""
-#: ../cli.py:1109
+#: ../cli.py:1310
msgid "debugging output level"
msgstr ""
-#: ../cli.py:1113
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr ""
-#: ../cli.py:1115
+#: ../cli.py:1316
msgid "error output level"
msgstr ""
-#: ../cli.py:1118
+#: ../cli.py:1319
msgid "quiet operation"
msgstr ""
-#: ../cli.py:1122
+#: ../cli.py:1321
+msgid "verbose operation"
+msgstr ""
+
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr ""
-#: ../cli.py:1124
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr ""
-#: ../cli.py:1125
+#: ../cli.py:1326
msgid "set install root"
msgstr ""
-#: ../cli.py:1129
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1133
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr ""
-#: ../cli.py:1136
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr ""
-#: ../cli.py:1138
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr ""
-#: ../cli.py:1141
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr ""
-#: ../cli.py:1143
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr ""
-#: ../cli.py:1145
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr ""
-#: ../cli.py:1147
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr ""
-#: ../cli.py:1150
+#: ../cli.py:1351
+msgid "enable plugins by name"
+msgstr ""
+
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr ""
-#: ../output.py:229
+#: ../cli.py:1356
+msgid "control whether color is used"
+msgstr ""
+
+#: ../output.py:305
msgid "Jan"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Feb"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Mar"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Apr"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "May"
msgstr ""
-#: ../output.py:229
+#: ../output.py:305
msgid "Jun"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Jul"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Aug"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Sep"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Oct"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Nov"
msgstr ""
-#: ../output.py:230
+#: ../output.py:306
msgid "Dec"
msgstr ""
-#: ../output.py:240
+#: ../output.py:316
msgid "Trying other mirror."
msgstr ""
-#: ../output.py:293
+#: ../output.py:538
#, python-format
-msgid "Name : %s"
+msgid "Name : %s%s%s"
msgstr ""
-#: ../output.py:294
+#: ../output.py:539
#, python-format
msgid "Arch : %s"
msgstr ""
-#: ../output.py:296
+#: ../output.py:541
#, python-format
msgid "Epoch : %s"
msgstr ""
-#: ../output.py:297
+#: ../output.py:542
#, python-format
msgid "Version : %s"
msgstr ""
-#: ../output.py:298
+#: ../output.py:543
#, python-format
msgid "Release : %s"
msgstr ""
-#: ../output.py:299
+#: ../output.py:544
#, python-format
msgid "Size : %s"
msgstr ""
-#: ../output.py:300
+#: ../output.py:545
#, python-format
msgid "Repo : %s"
msgstr ""
-#: ../output.py:302
+#: ../output.py:547
+#, python-format
+msgid "From repo : %s"
+msgstr ""
+
+#: ../output.py:549
#, python-format
msgid "Committer : %s"
msgstr ""
-#: ../output.py:303
+#: ../output.py:550
+#, python-format
+msgid "Committime : %s"
+msgstr ""
+
+#: ../output.py:551
+#, python-format
+msgid "Buildtime : %s"
+msgstr ""
+
+#: ../output.py:553
+#, python-format
+msgid "Installtime: %s"
+msgstr ""
+
+#: ../output.py:554
msgid "Summary : "
msgstr ""
-#: ../output.py:305
+#: ../output.py:556
#, python-format
msgid "URL : %s"
msgstr ""
-#: ../output.py:306
+#: ../output.py:557
#, python-format
msgid "License : %s"
msgstr ""
-#: ../output.py:307
+#: ../output.py:558
msgid "Description: "
msgstr ""
-#: ../output.py:351
-# REMEMBER to Translate [Y/N] to the current locale
-msgid "Is this ok [y/N]: "
+#: ../output.py:626
+msgid "y"
msgstr ""
-#: ../output.py:357 ../output.py:360
-msgid "y"
+#: ../output.py:626
+msgid "yes"
msgstr ""
-#: ../output.py:357
+#: ../output.py:627
msgid "n"
msgstr ""
-#: ../output.py:357 ../output.py:360
-msgid "yes"
+#: ../output.py:627
+msgid "no"
msgstr ""
-#: ../output.py:357
-msgid "no"
+#: ../output.py:631
+msgid "Is this ok [y/N]: "
msgstr ""
-#: ../output.py:367
+#: ../output.py:722
#, python-format
msgid ""
"\n"
"Group: %s"
msgstr ""
-#: ../output.py:369
+#: ../output.py:726
+#, python-format
+msgid " Group-Id: %s"
+msgstr ""
+
+#: ../output.py:731
#, python-format
msgid " Description: %s"
msgstr ""
-#: ../output.py:371
+#: ../output.py:733
msgid " Mandatory Packages:"
msgstr ""
-#: ../output.py:376
+#: ../output.py:734
msgid " Default Packages:"
msgstr ""
-#: ../output.py:381
+#: ../output.py:735
msgid " Optional Packages:"
msgstr ""
-#: ../output.py:386
+#: ../output.py:736
msgid " Conditional Packages:"
msgstr ""
-#: ../output.py:394
+#: ../output.py:756
#, python-format
msgid "package: %s"
msgstr ""
-#: ../output.py:396
+#: ../output.py:758
msgid " No dependencies for this package"
msgstr ""
-#: ../output.py:401
+#: ../output.py:763
#, python-format
msgid " dependency: %s"
msgstr ""
-#: ../output.py:403
+#: ../output.py:765
msgid " Unsatisfied dependency"
msgstr ""
-#: ../output.py:461
+#: ../output.py:837
+#, python-format
+msgid "Repo : %s"
+msgstr ""
+
+#: ../output.py:838
msgid "Matched from:"
msgstr ""
-#: ../output.py:487
-msgid "There was an error calculating total download size"
+#: ../output.py:847
+msgid "Description : "
msgstr ""
-#: ../output.py:492
+#: ../output.py:850
#, python-format
-msgid "Total size: %s"
+msgid "URL : %s"
msgstr ""
-#: ../output.py:495
+#: ../output.py:853
#, python-format
-msgid "Total download size: %s"
+msgid "License : %s"
msgstr ""
-#: ../output.py:507
-msgid "Package"
+#: ../output.py:856
+#, python-format
+msgid "Filename : %s"
msgstr ""
-#: ../output.py:507
-msgid "Arch"
+#: ../output.py:860
+msgid "Other : "
msgstr ""
-#: ../output.py:507
-msgid "Version"
+#: ../output.py:893
+msgid "There was an error calculating total download size"
msgstr ""
-#: ../output.py:507
-msgid "Repository"
+#: ../output.py:898
+#, python-format
+msgid "Total size: %s"
msgstr ""
-#: ../output.py:507
-msgid "Size"
+#: ../output.py:901
+#, python-format
+msgid "Total download size: %s"
msgstr ""
-#: ../output.py:514
+#: ../output.py:942
+msgid "Reinstalling"
+msgstr ""
+
+#: ../output.py:943
+msgid "Downgrading"
+msgstr ""
+
+#: ../output.py:944
msgid "Installing for dependencies"
msgstr ""
-#: ../output.py:515
+#: ../output.py:945
msgid "Updating for dependencies"
msgstr ""
-#: ../output.py:516
+#: ../output.py:946
msgid "Removing for dependencies"
msgstr ""
-#: ../output.py:528
+#: ../output.py:953 ../output.py:1065
+msgid "Skipped (dependency problems)"
+msgstr ""
+
+#: ../output.py:976
+msgid "Package"
+msgstr ""
+
+#: ../output.py:976
+msgid "Arch"
+msgstr ""
+
+#: ../output.py:977
+msgid "Version"
+msgstr ""
+
+#: ../output.py:977
+msgid "Repository"
+msgstr ""
+
+#: ../output.py:978
+msgid "Size"
+msgstr ""
+
+#: ../output.py:990
#, python-format
msgid ""
-" replacing %s.%s %s\n"
+" replacing %s%s%s.%s %s\n"
"\n"
msgstr ""
-#: ../output.py:536
+#: ../output.py:999
#, python-format
msgid ""
"\n"
"Transaction Summary\n"
-"=============================================================================\n"
-"Install %5.5s Package(s) \n"
-"Update %5.5s Package(s) \n"
-"Remove %5.5s Package(s) \n"
+"%s\n"
msgstr ""
-#: ../output.py:554
+#: ../output.py:1006
+#, python-format
+msgid ""
+"Install %5.5s Package(s)\n"
+"Upgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1015
+#, python-format
+msgid ""
+"Remove %5.5s Package(s)\n"
+"Reinstall %5.5s Package(s)\n"
+"Downgrade %5.5s Package(s)\n"
+msgstr ""
+
+#: ../output.py:1059
msgid "Removed"
msgstr ""
-#: ../output.py:555
+#: ../output.py:1060
msgid "Dependency Removed"
msgstr ""
-#: ../output.py:557
+#: ../output.py:1062
msgid "Dependency Installed"
msgstr ""
-#: ../output.py:559
+#: ../output.py:1064
msgid "Dependency Updated"
msgstr ""
-#: ../output.py:560
+#: ../output.py:1066
msgid "Replaced"
msgstr ""
-#: ../output.py:618
+#: ../output.py:1067
+msgid "Failed"
+msgstr ""
+
+#. Delta between C-c's so we treat as exit
+#: ../output.py:1133
+msgid "two"
+msgstr ""
+
+#. For translators: This is output like:
+#. Current download cancelled, interrupt (ctrl-c) again within two seconds
+#. to exit.
+#. Where "interupt (ctrl-c) again" and "two" are highlighted.
+#: ../output.py:1144
#, python-format
msgid ""
"\n"
" Current download cancelled, %sinterrupt (ctrl-c) again%s within %s%s%s "
-"seconds to exit.\n"
+"seconds\n"
+"to exit.\n"
msgstr ""
-#: ../output.py:628
+#: ../output.py:1155
msgid "user interrupt"
msgstr ""
-#: ../output.py:639
+#: ../output.py:1173
+msgid "Total"
+msgstr ""
+
+#: ../output.py:1203
+msgid "<unset>"
+msgstr ""
+
+#: ../output.py:1204
+msgid "System"
+msgstr ""
+
+#: ../output.py:1240
+msgid "Bad transaction IDs, or package(s), given"
+msgstr ""
+
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
+msgid "Warning: RPMDB has been altered since the last yum transaction."
+msgstr ""
+
+#: ../output.py:1289
+msgid "No transaction ID given"
+msgstr ""
+
+#: ../output.py:1297
+msgid "Bad transaction ID given"
+msgstr ""
+
+#: ../output.py:1302
+msgid "Not found given transaction ID"
+msgstr ""
+
+#: ../output.py:1310
+msgid "Found more than one transaction ID!"
+msgstr ""
+
+#: ../output.py:1331
+msgid "No transaction ID, or package, given"
+msgstr ""
+
+#: ../output.py:1357
+msgid "Transaction ID :"
+msgstr ""
+
+#: ../output.py:1359
+msgid "Begin time :"
+msgstr ""
+
+#: ../output.py:1362 ../output.py:1364
+msgid "Begin rpmdb :"
+msgstr ""
+
+#: ../output.py:1378
+#, python-format
+msgid "(%s seconds)"
+msgstr ""
+
+#: ../output.py:1379
+msgid "End time :"
+msgstr ""
+
+#: ../output.py:1382 ../output.py:1384
+msgid "End rpmdb :"
+msgstr ""
+
+#: ../output.py:1385
+msgid "User :"
+msgstr ""
+
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
+msgid "Return-Code :"
+msgstr ""
+
+#: ../output.py:1387
+msgid "Aborted"
+msgstr ""
+
+#: ../output.py:1389
+msgid "Failure:"
+msgstr ""
+
+#: ../output.py:1391
+msgid "Success"
+msgstr ""
+
+#: ../output.py:1392
+msgid "Transaction performed with:"
+msgstr ""
+
+#: ../output.py:1405
+msgid "Downgraded"
+msgstr ""
+
+#. multiple versions installed, both older and newer
+#: ../output.py:1407
+msgid "Weird"
+msgstr ""
+
+#: ../output.py:1409
+msgid "Packages Altered:"
+msgstr ""
+
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+msgid "Errors:"
+msgstr ""
+
+#: ../output.py:1489
+msgid "Last day"
+msgstr ""
+
+#: ../output.py:1490
+msgid "Last week"
+msgstr ""
+
+#: ../output.py:1491
+msgid "Last 2 weeks"
+msgstr ""
+
+#. US default :p
+#: ../output.py:1492
+msgid "Last 3 months"
+msgstr ""
+
+#: ../output.py:1493
+msgid "Last 6 months"
+msgstr ""
+
+#: ../output.py:1494
+msgid "Last year"
+msgstr ""
+
+#: ../output.py:1495
+msgid "Over a year ago"
+msgstr ""
+
+#: ../output.py:1524
msgid "installed"
msgstr ""
-#: ../output.py:640
+#: ../output.py:1525
msgid "updated"
msgstr ""
-#: ../output.py:641
+#: ../output.py:1526
msgid "obsoleted"
msgstr ""
-#: ../output.py:642
+#: ../output.py:1527
msgid "erased"
msgstr ""
-#: ../output.py:646
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr ""
-#: ../output.py:653
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr ""
-#: ../output.py:658
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr ""
-#: ../output.py:663
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr ""
-#: ../output.py:668
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr ""
-#: ../output.py:673
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr ""
-#: ../output.py:679
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr ""
-#: ../output.py:682
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr ""
-#: ../output.py:686
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr ""
-#: ../yumcommands.py:36
+#: ../utils.py:137 ../yummain.py:42
+msgid ""
+"\n"
+"\n"
+"Exiting on user cancel"
+msgstr ""
+
+#: ../utils.py:143 ../yummain.py:48
+msgid ""
+"\n"
+"\n"
+"Exiting on Broken Pipe"
+msgstr ""
+
+#: ../utils.py:145 ../yummain.py:50
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../utils.py:184 ../yummain.py:273
+msgid "Complete!"
+msgstr ""
+
+#: ../yumcommands.py:42
msgid "You need to be root to perform this command."
msgstr ""
-#: ../yumcommands.py:43
+#: ../yumcommands.py:49
msgid ""
"\n"
"You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -761,315 +1090,487 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
-#: ../yumcommands.py:63
+#: ../yumcommands.py:69
#, python-format
msgid "Error: Need to pass a list of pkgs to %s"
msgstr ""
-#: ../yumcommands.py:69
+#: ../yumcommands.py:75
msgid "Error: Need an item to match"
msgstr ""
-#: ../yumcommands.py:75
+#: ../yumcommands.py:81
msgid "Error: Need a group or list of groups"
msgstr ""
-#: ../yumcommands.py:84
+#: ../yumcommands.py:90
#, python-format
msgid "Error: clean requires an option: %s"
msgstr ""
-#: ../yumcommands.py:89
+#: ../yumcommands.py:95
#, python-format
msgid "Error: invalid clean argument: %r"
msgstr ""
-#: ../yumcommands.py:102
+#: ../yumcommands.py:108
msgid "No argument to shell"
msgstr ""
-#: ../yumcommands.py:105
+#: ../yumcommands.py:110
#, python-format
msgid "Filename passed to shell: %s"
msgstr ""
-#: ../yumcommands.py:109
+#: ../yumcommands.py:114
#, python-format
msgid "File %s given as argument to shell does not exist."
msgstr ""
-#: ../yumcommands.py:115
+#: ../yumcommands.py:120
msgid "Error: more than one file given as argument to shell."
msgstr ""
-#: ../yumcommands.py:156
+#: ../yumcommands.py:169
msgid "PACKAGE..."
msgstr ""
-#: ../yumcommands.py:159
+#: ../yumcommands.py:172
msgid "Install a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:168
+#: ../yumcommands.py:180
msgid "Setting up Install Process"
msgstr ""
-#: ../yumcommands.py:179
+#: ../yumcommands.py:191
msgid "[PACKAGE...]"
msgstr ""
-#: ../yumcommands.py:182
+#: ../yumcommands.py:194
msgid "Update a package or packages on your system"
msgstr ""
-#: ../yumcommands.py:190
+#: ../yumcommands.py:201
msgid "Setting up Update Process"
msgstr ""
-#: ../yumcommands.py:204
+#: ../yumcommands.py:246
msgid "Display details about a package or group of packages"
msgstr ""
-#: ../yumcommands.py:212
+#: ../yumcommands.py:295
msgid "Installed Packages"
msgstr ""
-#: ../yumcommands.py:213
+#: ../yumcommands.py:303
msgid "Available Packages"
msgstr ""
-#: ../yumcommands.py:214
+#: ../yumcommands.py:307
msgid "Extra Packages"
msgstr ""
-#: ../yumcommands.py:215
+#: ../yumcommands.py:311
msgid "Updated Packages"
msgstr ""
-#: ../yumcommands.py:221 ../yumcommands.py:225
+#. This only happens in verbose mode
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr ""
-#: ../yumcommands.py:226
+#: ../yumcommands.py:328
msgid "Recently Added Packages"
msgstr ""
-#: ../yumcommands.py:232
+#: ../yumcommands.py:335
msgid "No matching Packages to list"
msgstr ""
-#: ../yumcommands.py:246
+#: ../yumcommands.py:349
msgid "List a package or groups of packages"
msgstr ""
-#: ../yumcommands.py:258
+#: ../yumcommands.py:361
msgid "Remove a package or packages from your system"
msgstr ""
-#: ../yumcommands.py:266
+#: ../yumcommands.py:368
msgid "Setting up Remove Process"
msgstr ""
-#: ../yumcommands.py:278
+#: ../yumcommands.py:382
msgid "Setting up Group Process"
msgstr ""
-#: ../yumcommands.py:284
+#: ../yumcommands.py:388
msgid "No Groups on which to run command"
msgstr ""
-#: ../yumcommands.py:297
+#: ../yumcommands.py:401
msgid "List available package groups"
msgstr ""
-#: ../yumcommands.py:314
+#: ../yumcommands.py:418
msgid "Install the packages in a group on your system"
msgstr ""
-#: ../yumcommands.py:336
+#: ../yumcommands.py:440
msgid "Remove the packages in a group from your system"
msgstr ""
-#: ../yumcommands.py:360
+#: ../yumcommands.py:467
msgid "Display details about a package group"
msgstr ""
-#: ../yumcommands.py:384
+#: ../yumcommands.py:491
msgid "Generate the metadata cache"
msgstr ""
-#: ../yumcommands.py:390
+#: ../yumcommands.py:497
msgid "Making cache files for all metadata files."
msgstr ""
-#: ../yumcommands.py:391
+#: ../yumcommands.py:498
msgid "This may take a while depending on the speed of this computer"
msgstr ""
-#: ../yumcommands.py:412
+#: ../yumcommands.py:519
msgid "Metadata Cache Created"
msgstr ""
-#: ../yumcommands.py:426
+#: ../yumcommands.py:533
msgid "Remove cached data"
msgstr ""
-#: ../yumcommands.py:447
+#: ../yumcommands.py:553
msgid "Find what package provides the given value"
msgstr ""
-#: ../yumcommands.py:467
+#: ../yumcommands.py:573
msgid "Check for available package updates"
msgstr ""
-#: ../yumcommands.py:490
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr ""
-#: ../yumcommands.py:496
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr ""
-#: ../yumcommands.py:513
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr ""
-#: ../yumcommands.py:522
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr ""
-#: ../yumcommands.py:536
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr ""
-#: ../yumcommands.py:545
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr ""
-#: ../yumcommands.py:564
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr ""
-#: ../yumcommands.py:567
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr ""
-#: ../yumcommands.py:581
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr ""
-#: ../yumcommands.py:587
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr ""
-#: ../yumcommands.py:605
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr ""
-#: ../yumcommands.py:611
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr ""
-#: ../yumcommands.py:627
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo id"
+#: ../yumcommands.py:810 ../yumcommands.py:811
+msgid "enabled"
msgstr ""
-#: ../yumcommands.py:645
-msgid "repo name"
+#: ../yumcommands.py:819 ../yumcommands.py:820
+msgid "disabled"
msgstr ""
-#: ../yumcommands.py:645
-msgid "status"
+#: ../yumcommands.py:834
+msgid "Repo-id : "
msgstr ""
-#: ../yumcommands.py:651
-msgid "enabled"
+#: ../yumcommands.py:835
+msgid "Repo-name : "
msgstr ""
-#: ../yumcommands.py:654
-msgid "disabled"
+#: ../yumcommands.py:836
+msgid "Repo-status : "
+msgstr ""
+
+#: ../yumcommands.py:838
+msgid "Repo-revision: "
+msgstr ""
+
+#: ../yumcommands.py:842
+msgid "Repo-tags : "
+msgstr ""
+
+#: ../yumcommands.py:848
+msgid "Repo-distro-tags: "
+msgstr ""
+
+#: ../yumcommands.py:853
+msgid "Repo-updated : "
msgstr ""
-#: ../yumcommands.py:671
+#: ../yumcommands.py:855
+msgid "Repo-pkgs : "
+msgstr ""
+
+#: ../yumcommands.py:856
+msgid "Repo-size : "
+msgstr ""
+
+#: ../yumcommands.py:863
+msgid "Repo-baseurl : "
+msgstr ""
+
+#: ../yumcommands.py:871
+msgid "Repo-metalink: "
+msgstr ""
+
+#: ../yumcommands.py:875
+msgid " Updated : "
+msgstr ""
+
+#: ../yumcommands.py:878
+msgid "Repo-mirrors : "
+msgstr ""
+
+#: ../yumcommands.py:882 ../yummain.py:133
+msgid "Unknown"
+msgstr ""
+
+#: ../yumcommands.py:888
+#, python-format
+msgid "Never (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:890
+#, python-format
+msgid "Instant (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:893
+#, python-format
+msgid "%s second(s) (last: %s)"
+msgstr ""
+
+#: ../yumcommands.py:895
+msgid "Repo-expire : "
+msgstr ""
+
+#: ../yumcommands.py:898
+msgid "Repo-exclude : "
+msgstr ""
+
+#: ../yumcommands.py:902
+msgid "Repo-include : "
+msgstr ""
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:912 ../yumcommands.py:938
+msgid "repo id"
+msgstr ""
+
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
+msgid "status"
+msgstr ""
+
+#: ../yumcommands.py:939
+msgid "repo name"
+msgstr ""
+
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr ""
-#: ../yumcommands.py:705
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr ""
-#: ../yumcommands.py:710
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
"aliases: "
msgstr ""
-#: ../yumcommands.py:712
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
"alias: "
msgstr ""
-#: ../yumcommands.py:741
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr ""
-#: ../yumcommands.py:755
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr ""
-#: ../yummain.py:41
-msgid ""
-"\n"
-"\n"
-"Exiting on user cancel"
+#: ../yumcommands.py:1060
+msgid "Setting up Downgrade Process"
msgstr ""
-#: ../yummain.py:47
-msgid ""
-"\n"
-"\n"
-"Exiting on Broken Pipe"
+#: ../yumcommands.py:1067
+msgid "downgrade a package"
+msgstr ""
+
+#: ../yumcommands.py:1081
+msgid "Display a version for the machine and/or available repos."
+msgstr ""
+
+#: ../yumcommands.py:1111
+msgid " Yum version groups:"
+msgstr ""
+
+#: ../yumcommands.py:1121
+msgid " Group :"
+msgstr ""
+
+#: ../yumcommands.py:1122
+msgid " Packages:"
+msgstr ""
+
+#: ../yumcommands.py:1152
+msgid "Installed:"
+msgstr ""
+
+#: ../yumcommands.py:1157
+msgid "Group-Installed:"
+msgstr ""
+
+#: ../yumcommands.py:1166
+msgid "Available:"
+msgstr ""
+
+#: ../yumcommands.py:1172
+msgid "Group-Available:"
+msgstr ""
+
+#: ../yumcommands.py:1211
+msgid "Display, or use, the transaction history"
+msgstr ""
+
+#: ../yumcommands.py:1239
+#, python-format
+msgid "Invalid history sub-command, use: %s."
+msgstr ""
+
+#: ../yummain.py:128
+msgid "Running"
+msgstr ""
+
+#: ../yummain.py:129
+msgid "Sleeping"
+msgstr ""
+
+#: ../yummain.py:130
+msgid "Uninteruptable"
+msgstr ""
+
+#: ../yummain.py:131
+msgid "Zombie"
+msgstr ""
+
+#: ../yummain.py:132
+msgid "Traced/Stopped"
+msgstr ""
+
+#: ../yummain.py:137
+msgid " The other application is: PackageKit"
+msgstr ""
+
+#: ../yummain.py:139
+#, python-format
+msgid " The other application is: %s"
msgstr ""
-#: ../yummain.py:105
+#: ../yummain.py:142
+#, python-format
+msgid " Memory : %5s RSS (%5sB VSZ)"
+msgstr ""
+
+#: ../yummain.py:146
+#, python-format
+msgid " Started: %s - %s ago"
+msgstr ""
+
+#: ../yummain.py:148
+#, python-format
+msgid " State : %s, pid: %d"
+msgstr ""
+
+#: ../yummain.py:173
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
msgstr ""
-#: ../yummain.py:132 ../yummain.py:171
+#: ../yummain.py:201 ../yummain.py:240
#, python-format
msgid "Error: %s"
msgstr ""
-#: ../yummain.py:142 ../yummain.py:178
+#: ../yummain.py:211 ../yummain.py:253
#, python-format
msgid "Unknown Error(s): Exit Code: %d:"
msgstr ""
#. Depsolve stage
-#: ../yummain.py:149
+#: ../yummain.py:218
msgid "Resolving Dependencies"
msgstr ""
-#: ../yummain.py:184
+#: ../yummain.py:242
+msgid " You could try using --skip-broken to work around the problem"
+msgstr ""
+
+#: ../yummain.py:243
msgid ""
-"\n"
-"Dependencies Resolved"
+" You could try running: package-cleanup --problems\n"
+" package-cleanup --dupes\n"
+" rpm -Va --nofiles --nodigest"
msgstr ""
-#: ../yummain.py:198
-msgid "Complete!"
+#: ../yummain.py:259
+msgid ""
+"\n"
+"Dependencies Resolved"
msgstr ""
-#: ../yummain.py:245
+#: ../yummain.py:326
msgid ""
"\n"
"\n"
@@ -1080,681 +1581,734 @@ msgstr ""
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/depsolve.py:95
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr ""
-#: ../yum/depsolve.py:136
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr ""
-#: ../yum/depsolve.py:147
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr ""
-#: ../yum/depsolve.py:170
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr ""
-#: ../yum/depsolve.py:178
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr ""
-#: ../yum/depsolve.py:219
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr ""
-#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr ""
-#: ../yum/depsolve.py:240
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr ""
-#: ../yum/depsolve.py:250
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr ""
-#: ../yum/depsolve.py:261
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr ""
-#: ../yum/depsolve.py:312
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr ""
-#: ../yum/depsolve.py:322
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr ""
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr ""
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr ""
-#: ../yum/depsolve.py:356
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr ""
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr ""
-#: ../yum/depsolve.py:372
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr ""
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr ""
-#: ../yum/depsolve.py:388
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr ""
+#: ../yum/depsolve.py:440
+#, python-format
+msgid "Quick matched %s to require for %s"
+msgstr ""
+
#. is it already installed?
-#: ../yum/depsolve.py:434
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr ""
-#: ../yum/depsolve.py:449
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr ""
-#: ../yum/depsolve.py:460
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr ""
-#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr ""
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr ""
-#: ../yum/depsolve.py:510
-#, python-format
-msgid ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr ""
-
-#: ../yum/depsolve.py:537
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr ""
-#: ../yum/depsolve.py:544
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr ""
-#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#: ../yum/depsolve.py:685 ../yum/depsolve.py:767
msgid "Success - empty transaction"
msgstr ""
-#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+#: ../yum/depsolve.py:724 ../yum/depsolve.py:739
msgid "Restarting Loop"
msgstr ""
-#: ../yum/depsolve.py:702
+#: ../yum/depsolve.py:755
msgid "Dependency Process ending"
msgstr ""
-#: ../yum/depsolve.py:708
+#: ../yum/depsolve.py:761
#, python-format
msgid "%s from %s has depsolving problems"
msgstr ""
-#: ../yum/depsolve.py:715
+#: ../yum/depsolve.py:768
msgid "Success - deps resolved"
msgstr ""
-#: ../yum/depsolve.py:729
+#: ../yum/depsolve.py:782
#, python-format
msgid "Checking deps for %s"
msgstr ""
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:865
#, python-format
msgid "looking for %s as a requirement of %s"
msgstr ""
-#: ../yum/depsolve.py:933
-#, python-format
-msgid "Comparing best: %s to po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:937
-#, python-format
-msgid "Same: best %s == po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
-#, python-format
-msgid "best %s obsoletes po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:955
+#: ../yum/depsolve.py:1007
#, python-format
-msgid "po %s obsoletes best: %s"
+msgid "Running compare_providers() for %s"
msgstr ""
-#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:1041 ../yum/depsolve.py:1047
#, python-format
msgid "better arch in po %s"
msgstr ""
-#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#: ../yum/depsolve.py:1142
#, python-format
-msgid "po %s shares a sourcerpm with %s"
+msgid "%s obsoletes %s"
msgstr ""
-#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:1154
#, python-format
-msgid "best %s shares a sourcerpm with %s"
+msgid ""
+"archdist compared %s to %s on %s\n"
+" Winner: %s"
msgstr ""
-#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:1161
#, python-format
-msgid "po %s shares more of the name prefix with %s"
+msgid "common sourcerpm %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1167
#, python-format
-msgid "po %s has a shorter name than best %s"
+msgid "common prefix of %s between %s and %s"
msgstr ""
-#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1175
#, python-format
-msgid "bestpkg %s shares more of the name prefix with %s"
+msgid "Best Order: %s"
msgstr ""
-#: ../yum/__init__.py:119
+#: ../yum/__init__.py:187
msgid "doConfigSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:296
+#: ../yum/__init__.py:412
#, python-format
msgid "Repository %r is missing name in configuration, using id"
msgstr ""
-#: ../yum/__init__.py:332
+#: ../yum/__init__.py:450
msgid "plugins already initialised"
msgstr ""
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:457
msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:349
+#: ../yum/__init__.py:468
msgid "Reading Local RPMDB"
msgstr ""
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:489
msgid "doRepoSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:387
+#: ../yum/__init__.py:509
msgid "doSackSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:404
+#: ../yum/__init__.py:539
msgid "Setting up Package Sacks"
msgstr ""
-#: ../yum/__init__.py:447
+#: ../yum/__init__.py:584
#, python-format
msgid "repo object for repo %s lacks a _resetSack method\n"
msgstr ""
-#: ../yum/__init__.py:448
+#: ../yum/__init__.py:585
msgid "therefore this repo cannot be reset.\n"
msgstr ""
-#: ../yum/__init__.py:453
+#: ../yum/__init__.py:590
msgid "doUpdateSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:465
+#: ../yum/__init__.py:602
msgid "Building updates object"
msgstr ""
-#: ../yum/__init__.py:496
+#: ../yum/__init__.py:637
msgid "doGroupSetup() will go away in a future version of Yum.\n"
msgstr ""
-#: ../yum/__init__.py:520
+#: ../yum/__init__.py:662
msgid "Getting group metadata"
msgstr ""
-#: ../yum/__init__.py:546
+#: ../yum/__init__.py:688
#, python-format
msgid "Adding group file from repository: %s"
msgstr ""
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:697
#, python-format
msgid "Failed to add groups file for repository: %s - %s"
msgstr ""
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:703
msgid "No Groups Available in any repository"
msgstr ""
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:763
msgid "Importing additional filelist information"
msgstr ""
-#: ../yum/__init__.py:657
+#: ../yum/__init__.py:777
+#, python-format
+msgid "The program %s%s%s is found in the yum-utils package."
+msgstr ""
+
+#: ../yum/__init__.py:785
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+
+#: ../yum/__init__.py:853
#, python-format
msgid "Skip-broken round %i"
msgstr ""
-#: ../yum/__init__.py:680
+#: ../yum/__init__.py:906
#, python-format
msgid "Skip-broken took %i rounds "
msgstr ""
-#: ../yum/__init__.py:681
+#: ../yum/__init__.py:907
msgid ""
"\n"
"Packages skipped because of dependency problems:"
msgstr ""
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr ""
-#: ../yum/__init__.py:774
-#, python-format
-msgid "Failed to remove transaction file %s"
-msgstr ""
-
-#: ../yum/__init__.py:814
-#, python-format
-msgid "excluding for cost: %s from %s"
-msgstr ""
-
-#: ../yum/__init__.py:845
-msgid "Excluding Packages in global exclude list"
-msgstr ""
-
-#: ../yum/__init__.py:847
-#, python-format
-msgid "Excluding Packages from %s"
+#: ../yum/__init__.py:1083
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
-#: ../yum/__init__.py:875
+#: ../yum/__init__.py:1101
#, python-format
-msgid "Reducing %s to included packages only"
+msgid "Failed to remove transaction file %s"
msgstr ""
-#: ../yum/__init__.py:880
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1130
#, python-format
-msgid "Keeping included package %s"
+msgid "%s was supposed to be installed but is not!"
msgstr ""
-#: ../yum/__init__.py:886
+#. maybe a file log here, too
+#. but raising an exception is not going to do any good
+#: ../yum/__init__.py:1169
#, python-format
-msgid "Removing unmatched package %s"
-msgstr ""
-
-#: ../yum/__init__.py:889
-msgid "Finished"
+msgid "%s was supposed to be removed but is not!"
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:919
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr ""
#. Another copy seems to be running.
-#: ../yum/__init__.py:923
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr ""
-#: ../yum/__init__.py:970 ../yum/__init__.py:977
+#. Whoa. What the heck happened?
+#: ../yum/__init__.py:1328
+#, python-format
+msgid "Could not create lock at %s: %s "
+msgstr ""
+
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr ""
-#: ../yum/__init__.py:991
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr ""
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr ""
-#: ../yum/__init__.py:1036
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr ""
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr ""
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1477
#, python-format
-msgid "Insufficient space in download directory %s to download"
+msgid ""
+"Insufficient space in download directory %s\n"
+" * free %s\n"
+" * needed %s"
msgstr ""
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr ""
-#: ../yum/__init__.py:1134
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr ""
-#: ../yum/__init__.py:1189
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr ""
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr ""
-#: ../yum/__init__.py:1201
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr ""
-#: ../yum/__init__.py:1205
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr ""
-#: ../yum/__init__.py:1243
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr ""
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr ""
-#: ../yum/__init__.py:1283
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr ""
-#: ../yum/__init__.py:1287
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr ""
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr ""
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr ""
-#: ../yum/__init__.py:1335
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr ""
-#: ../yum/__init__.py:1543
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
msgstr ""
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr ""
-#: ../yum/__init__.py:1584
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr ""
-#: ../yum/__init__.py:1596
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr ""
-#: ../yum/__init__.py:1603
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr ""
-#: ../yum/__init__.py:1633
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr ""
-#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#: ../yum/__init__.py:2170
+msgid "No group data available for configured repositories"
+msgstr ""
+
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr ""
-#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr ""
-#: ../yum/__init__.py:1770
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr ""
-#: ../yum/__init__.py:1774
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr ""
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr ""
-#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
-msgid "Invalid versioned dependency string, try quoting it."
+#: ../yum/__init__.py:2399
+#, python-format
+msgid "Package tuple %s could not be found in rpmdb"
msgstr ""
-#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr ""
-#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr ""
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr ""
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr ""
-#. only one in there
-#: ../yum/__init__.py:2085
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr ""
-#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr ""
-#. FIXME - this is where we could check to see if it already installed
-#. for returning better errors
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2798
+#, python-format
+msgid "Package %s installed and not available"
+msgstr ""
+
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr ""
-#: ../yum/__init__.py:2158
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr ""
-#: ../yum/__init__.py:2171
+#: ../yum/__init__.py:2839
+#, python-format
+msgid "Package %s is obsoleted by %s which is already installed"
+msgstr ""
+
+#: ../yum/__init__.py:2842
+#, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr ""
+
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr ""
-#: ../yum/__init__.py:2178
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr ""
#. update everything (the easy case)
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:2304
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr ""
-#: ../yum/__init__.py:2377
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr ""
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:3093
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3124
+#, python-format
+msgid "Not Updating Package that is obsoleted: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr ""
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr ""
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr ""
-#: ../yum/__init__.py:2468
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr ""
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr ""
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr ""
-#: ../yum/__init__.py:2486
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr ""
-#: ../yum/__init__.py:2504
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr ""
-#: ../yum/__init__.py:2515
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr ""
-#: ../yum/__init__.py:2522
-msgid "Problem in reinstall: no package matched to install"
+#: ../yum/__init__.py:3413
+#, python-format
+msgid "Problem in reinstall: no package %s matched to install"
+msgstr ""
+
+#: ../yum/__init__.py:3515
+msgid "No package(s) available to downgrade"
msgstr ""
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:3559
+#, python-format
+msgid "No Match for available package: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3565
+#, python-format
+msgid "Only Upgrade available on package: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
+#, python-format
+msgid "Failed to downgrade: %s"
+msgstr ""
+
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr ""
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr ""
-#: ../yum/__init__.py:2589
-msgid "GPG key parsing failed: "
+#: ../yum/__init__.py:3735
+#, python-format
+msgid "GPG key parsing failed: key does not have value %s"
msgstr ""
-#: ../yum/__init__.py:2593
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr ""
#. Try installing/updating GPG key
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr ""
-#: ../yum/__init__.py:2610
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr ""
-#: ../yum/__init__.py:2616
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr ""
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr ""
-#: ../yum/__init__.py:2624
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1762,99 +2316,128 @@ msgid ""
"Check that the correct key URLs are configured for this repository."
msgstr ""
-#: ../yum/__init__.py:2633
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr ""
-#: ../yum/__init__.py:2707
+#: ../yum/__init__.py:3829
+#, python-format
+msgid "GPG key at %s (0x%s) is already imported"
+msgstr ""
+
+#: ../yum/__init__.py:3849
+#, python-format
+msgid "Not installing key for repo %s"
+msgstr ""
+
+#: ../yum/__init__.py:3854
+msgid "Key import failed"
+msgstr ""
+
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr ""
-#: ../yum/__init__.py:2709
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:2774
+#: ../yum/__init__.py:4028
+#, python-format
+msgid "Please report this error at %s"
+msgstr ""
+
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr ""
#. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:195
+#: ../yum/plugins.py:202
msgid "Loaded plugins: "
msgstr ""
-#: ../yum/plugins.py:206
+#: ../yum/plugins.py:216 ../yum/plugins.py:222
#, python-format
msgid "No plugin match for: %s"
msgstr ""
-#: ../yum/plugins.py:219
+#: ../yum/plugins.py:252
#, python-format
-msgid "\"%s\" plugin is disabled"
+msgid "Not loading \"%s\" plugin, as it is disabled"
msgstr ""
-#: ../yum/plugins.py:231
+#. Give full backtrace:
+#: ../yum/plugins.py:264
+#, python-format
+msgid "Plugin \"%s\" can't be imported"
+msgstr ""
+
+#: ../yum/plugins.py:271
#, python-format
msgid "Plugin \"%s\" doesn't specify required API version"
msgstr ""
-#: ../yum/plugins.py:235
+#: ../yum/plugins.py:276
#, python-format
msgid "Plugin \"%s\" requires API %s. Supported API is %s."
msgstr ""
-#: ../yum/plugins.py:264
+#: ../yum/plugins.py:309
#, python-format
msgid "Loading \"%s\" plugin"
msgstr ""
-#: ../yum/plugins.py:271
+#: ../yum/plugins.py:316
#, python-format
msgid ""
"Two or more plugins with the name \"%s\" exist in the plugin search path"
msgstr ""
-#: ../yum/plugins.py:291
+#: ../yum/plugins.py:336
#, python-format
msgid "Configuration file %s not found"
msgstr ""
#. for
#. Configuration files for the plugin not found
-#: ../yum/plugins.py:294
+#: ../yum/plugins.py:339
#, python-format
msgid "Unable to find configuration file for plugin %s"
msgstr ""
-#: ../yum/plugins.py:448
+#: ../yum/plugins.py:501
msgid "registration of commands not supported"
msgstr ""
-#: ../rpmUtils/oldUtils.py:26
+#: ../yum/rpmtrans.py:78
+msgid "Repackaging"
+msgstr ""
+
+#: ../rpmUtils/oldUtils.py:33
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
msgstr ""
-#: ../rpmUtils/oldUtils.py:46
+#: ../rpmUtils/oldUtils.py:53
#, python-format
msgid "RPM %s fails md5 check"
msgstr ""
-#: ../rpmUtils/oldUtils.py:144
+#: ../rpmUtils/oldUtils.py:151
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
msgstr ""
-#: ../rpmUtils/oldUtils.py:174
+#: ../rpmUtils/oldUtils.py:183
msgid "Got an empty Header, something has gone wrong"
msgstr ""
-#: ../rpmUtils/oldUtils.py:244 ../rpmUtils/oldUtils.py:251
-#: ../rpmUtils/oldUtils.py:254 ../rpmUtils/oldUtils.py:257
+#: ../rpmUtils/oldUtils.py:253 ../rpmUtils/oldUtils.py:260
+#: ../rpmUtils/oldUtils.py:263 ../rpmUtils/oldUtils.py:266
#, python-format
msgid "Damaged Header %s"
msgstr ""
-#: ../rpmUtils/oldUtils.py:272
+#: ../rpmUtils/oldUtils.py:281
#, python-format
msgid "Error opening rpm %s - error %s"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 87974bc..4ddb665 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 05:22+0000\n"
+"POT-Creation-Date: 2009-10-15 15:45+0200\n"
"PO-Revision-Date: 2009-09-27 18:39+0800\n"
"Last-Translator: Yuan Yijun <bbbush@fedoraproject.org>\n"
"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -36,16 +36,16 @@ msgstr "正在安装"
msgid "Obsoleted"
msgstr "被取代"
-#: ../callback.py:54 ../output.py:1063 ../output.py:1401
+#: ../callback.py:54 ../output.py:1063 ../output.py:1403
msgid "Updated"
msgstr "更新完毕"
-#: ../callback.py:55 ../output.py:1397
+#: ../callback.py:55 ../output.py:1399
msgid "Erased"
msgstr "已删除"
#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1061
-#: ../output.py:1393
+#: ../output.py:1395
msgid "Installed"
msgstr "已安装"
@@ -75,59 +75,60 @@ msgstr "正在删除"
msgid "Cleanup"
msgstr "清理"
-#: ../cli.py:108
+#: ../cli.py:106
#, python-format
msgid "Command \"%s\" already defined"
msgstr "命令 \"%s\" 已有定义"
-#: ../cli.py:120
+#: ../cli.py:118
msgid "Setting up repositories"
msgstr "设置仓库"
-#: ../cli.py:131
+#: ../cli.py:129
msgid "Reading repository metadata in from local files"
msgstr "从本地文件读入仓库元数据"
-#: ../cli.py:194 ../utils.py:102
+#: ../cli.py:192 ../utils.py:107
#, python-format
msgid "Config Error: %s"
msgstr "配置错误：%s"
-#: ../cli.py:197 ../cli.py:1253 ../utils.py:105
+#: ../cli.py:195 ../cli.py:1251 ../utils.py:110
#, python-format
msgid "Options Error: %s"
msgstr "属性错误：%s"
-#: ../cli.py:225
-#, python-format, fuzzy
+#: ../cli.py:223
+#, fuzzy, python-format
msgid " Installed: %s-%s at %s"
msgstr " 已安装: %s-%s at %s"
-#: ../cli.py:227
+#: ../cli.py:225
#, fuzzy, python-format
msgid " Built : %s at %s"
msgstr "统一资源定位符: %s"
-#: ../cli.py:229
+#: ../cli.py:227
#, fuzzy, python-format
msgid " Committed: %s at %s"
msgstr "Übermittler : %s"
-#: ../cli.py:268
+#: ../cli.py:266
msgid "You need to give some command"
msgstr "你需要给出命令"
-#: ../cli.py:311
+#: ../cli.py:309
msgid "Disk Requirements:\n"
msgstr "磁盘要求：\n"
+#: ../cli.py:311
#, python-format
msgid " At least %dMB needed on the %s filesystem.\n"
msgstr " At least %dMB needed on the %s filesystem.\n"
#. TODO: simplify the dependency errors?
#. Fixup the summary
-#: ../cli.py:318
+#: ../cli.py:316
msgid ""
"Error Summary\n"
"-------------\n"
@@ -135,64 +136,64 @@ msgstr ""
"出错情况\n"
"-------------\n"
-#: ../cli.py:361
+#: ../cli.py:359
msgid "Trying to run the transaction but nothing to do. Exiting."
msgstr "尝试执行事务但无须任何处理。现在退出。"
-#: ../cli.py:397
+#: ../cli.py:395
msgid "Exiting on user Command"
msgstr "在用户的命令下退出"
-#: ../cli.py:401
+#: ../cli.py:399
msgid "Downloading Packages:"
msgstr "下载软件包："
-#: ../cli.py:406
+#: ../cli.py:404
msgid "Error Downloading Packages:\n"
msgstr "下载软件包出错：\n"
-#: ../cli.py:420 ../yum/__init__.py:3995
+#: ../cli.py:418 ../yum/__init__.py:4014
msgid "Running rpm_check_debug"
msgstr "运行 rpm_check_debug "
-#: ../cli.py:429 ../yum/__init__.py:4004
+#: ../cli.py:427 ../yum/__init__.py:4023
msgid "ERROR You need to update rpm to handle:"
msgstr "错误：您需要更新 rpm 以处理："
-#: ../cli.py:431 ../yum/__init__.py:4007
+#: ../cli.py:429 ../yum/__init__.py:4026
msgid "ERROR with rpm_check_debug vs depsolve:"
msgstr "运行 rpm_check_debug 时依赖关系出错："
-#: ../cli.py:437
+#: ../cli.py:435
msgid "RPM needs to be updated"
msgstr "RPM 需要更新"
-#: ../cli.py:438
+#: ../cli.py:436
#, fuzzy, python-format
msgid "Please report this error in %s"
msgstr "请报告这个错误给 Bugzilla"
-#: ../cli.py:444
+#: ../cli.py:442
msgid "Running Transaction Test"
msgstr "执行事务测试"
-#: ../cli.py:460
+#: ../cli.py:458
msgid "Finished Transaction Test"
msgstr "完成事务测试"
-#: ../cli.py:462
+#: ../cli.py:460
msgid "Transaction Check Error:\n"
msgstr "事务测试出错：\n"
-#: ../cli.py:469
+#: ../cli.py:467
msgid "Transaction Test Succeeded"
msgstr "事务测试成功"
-#: ../cli.py:491
+#: ../cli.py:489
msgid "Running Transaction"
msgstr "执行事务"
-#: ../cli.py:521
+#: ../cli.py:519
msgid ""
"Refusing to automatically import keys when running unattended.\n"
"Use \"-y\" to override."
@@ -200,294 +201,299 @@ msgstr ""
"如果不加干预，拒绝自动导入密钥。\n"
"指定 \"-y\" 改变这个行为。"
-#: ../cli.py:540 ../cli.py:574
+#: ../cli.py:538 ../cli.py:572
msgid " * Maybe you meant: "
msgstr " * 也许您希望："
-#: ../cli.py:557 ../cli.py:565
+#: ../cli.py:555 ../cli.py:563
#, fuzzy, python-format
msgid "Package(s) %s%s%s available, but not installed."
msgstr "没有包可供安装."
-#: ../cli.py:571 ../cli.py:602 ../cli.py:680
+#: ../cli.py:569 ../cli.py:600 ../cli.py:678
#, fuzzy, python-format
msgid "No package %s%s%s available."
msgstr "包 %s 不可提供."
-#: ../cli.py:607 ../cli.py:740
+#: ../cli.py:605 ../cli.py:738
msgid "Package(s) to install"
msgstr "将安装的软件包"
-#: ../cli.py:608 ../cli.py:686 ../cli.py:719 ../cli.py:741
+#: ../cli.py:606 ../cli.py:684 ../cli.py:717 ../cli.py:739
#: ../yumcommands.py:159
msgid "Nothing to do"
msgstr "无须任何处理"
-#: ../cli.py:641
+#: ../cli.py:639
#, python-format
msgid "%d packages marked for Update"
msgstr "升级 %d 个软件包"
-#: ../cli.py:644
+#: ../cli.py:642
msgid "No Packages marked for Update"
msgstr "不升级任何软件包"
-#: ../cli.py:658
+#: ../cli.py:656
#, python-format
msgid "%d packages marked for removal"
msgstr "删除 %d 个软件包"
-#: ../cli.py:661
+#: ../cli.py:659
msgid "No Packages marked for removal"
msgstr "不删除任何软件包"
-#: ../cli.py:685
+#: ../cli.py:683
#, fuzzy
msgid "Package(s) to downgrade"
msgstr "包将安装"
-#: ../cli.py:709
+#: ../cli.py:707
#, fuzzy, python-format
msgid " (from %s)"
msgstr " %s 从 %s"
-#: ../cli.py:711
+#: ../cli.py:709
#, fuzzy, python-format
msgid "Installed package %s%s%s%s not available."
msgstr "包 %s 不可提供."
-#: ../cli.py:718
+#: ../cli.py:716
#, fuzzy
msgid "Package(s) to reinstall"
msgstr "包将安装"
-#: ../cli.py:731
+#: ../cli.py:729
msgid "No Packages Provided"
msgstr "未指定软件包"
-#: ../cli.py:815
+#: ../cli.py:813
#, python-format
msgid "Warning: No matches found for: %s"
msgstr "警告：没有匹配 %s 的软件包"
-#: ../cli.py:818
+#: ../cli.py:816
msgid "No Matches found"
msgstr "没有找到匹配的软件包"
-#: ../cli.py:857
+#: ../cli.py:855
#, python-format
msgid ""
"Warning: 3.0.x versions of yum would erroneously match against filenames.\n"
" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
-msgstr "警告：3.0.x 版本的 yum 匹配文件名时会出错。可以用 \"%s*/%s%s\" 或 \"%s*bin/%s%s\" 得到这个结果"
+msgstr ""
+"警告：3.0.x 版本的 yum 匹配文件名时会出错。可以用 \"%s*/%s%s\" 或 \"%s*bin/%s"
+"%s\" 得到这个结果"
-#: ../cli.py:873
+#: ../cli.py:871
#, python-format
msgid "No Package Found for %s"
msgstr "没有找到 %s 软件包"
-#: ../cli.py:885
+#: ../cli.py:883
msgid "Cleaning up Everything"
msgstr "清理一切"
-#: ../cli.py:899
+#: ../cli.py:897
msgid "Cleaning up Headers"
msgstr "清理文件头缓存"
-#: ../cli.py:902
+#: ../cli.py:900
msgid "Cleaning up Packages"
msgstr "清理软件包"
-#: ../cli.py:905
+#: ../cli.py:903
msgid "Cleaning up xml metadata"
msgstr "清理 XML 元数据"
-#: ../cli.py:908
+#: ../cli.py:906
msgid "Cleaning up database cache"
msgstr "清理数据库缓存"
-#: ../cli.py:911
+#: ../cli.py:909
#, fuzzy
msgid "Cleaning up expire-cache metadata"
msgstr "清理XML元数据"
-#: ../cli.py:914
+#: ../cli.py:912
msgid "Cleaning up plugins"
msgstr "清理插件"
-#: ../cli.py:939
+#: ../cli.py:937
msgid "Installed Groups:"
msgstr "已安装的组："
-#: ../cli.py:951
+#: ../cli.py:949
msgid "Available Groups:"
msgstr "有效的组:"
-#: ../cli.py:961
+#: ../cli.py:959
msgid "Done"
msgstr "完成"
-#: ../cli.py:972 ../cli.py:990 ../cli.py:996 ../yum/__init__.py:2621
+#: ../cli.py:970 ../cli.py:988 ../cli.py:994 ../yum/__init__.py:2629
#, python-format
msgid "Warning: Group %s does not exist."
msgstr "警告：组 %s 不存在。"
-#: ../cli.py:1000
+#: ../cli.py:998
msgid "No packages in any requested group available to install or update"
msgstr "指定组中没有可安装或升级的软件包"
-#: ../cli.py:1002
+#: ../cli.py:1000
#, python-format
msgid "%d Package(s) to Install"
msgstr "安装 %d 个软件包"
-#: ../cli.py:1012 ../yum/__init__.py:2633
+#: ../cli.py:1010 ../yum/__init__.py:2641
#, python-format
msgid "No group named %s exists"
msgstr "没有名为 %s 的组"
-#: ../cli.py:1018
+#: ../cli.py:1016
msgid "No packages to remove from groups"
msgstr "指定组中没有要删除的软件包"
-#: ../cli.py:1020
+#: ../cli.py:1018
#, python-format
msgid "%d Package(s) to remove"
msgstr "删除 %d 个软件包"
-#: ../cli.py:1062
+#: ../cli.py:1060
#, python-format
msgid "Package %s is already installed, skipping"
msgstr "略过已安装的 %s 软件包"
-#: ../cli.py:1073
+#: ../cli.py:1071
#, python-format
msgid "Discarding non-comparable pkg %s.%s"
msgstr "丢弃不可比较的软件包 %s.%s"
#. we've not got any installed that match n or n+a
-#: ../cli.py:1099
+#: ../cli.py:1097
#, python-format
msgid "No other %s installed, adding to list for potential install"
msgstr "%s 未安装，加入列表以备安装"
-#: ../cli.py:1119
+#: ../cli.py:1117
msgid "Plugin Options"
msgstr "插件选项"
-#: ../cli.py:1127
+#: ../cli.py:1125
#, python-format
msgid "Command line error: %s"
msgstr "命令行错误：%s"
-#: ../cli.py:1140
+#: ../cli.py:1138
#, python-format
msgid ""
"\n"
"\n"
"%s: %s option requires an argument"
-msgstr "\n\n%s: %s 选项需要参数"
+msgstr ""
+"\n"
+"\n"
+"%s: %s 选项需要参数"
-#: ../cli.py:1193
+#: ../cli.py:1191
msgid "--color takes one of: auto, always, never"
msgstr "--color 需要参数：auto, always, never"
-#: ../cli.py:1300
+#: ../cli.py:1298
#, fuzzy
msgid "show this help message and exit"
msgstr "显示 YUM版本信息并退出"
-#: ../cli.py:1304
+#: ../cli.py:1302
msgid "be tolerant of errors"
msgstr "容忍错误"
-#: ../cli.py:1306
+#: ../cli.py:1304
msgid "run entirely from cache, don't update cache"
msgstr "从缓冲中运行，不要升级缓存"
-#: ../cli.py:1308
+#: ../cli.py:1306
msgid "config file location"
msgstr "配置文件路径"
-#: ../cli.py:1310
+#: ../cli.py:1308
msgid "maximum command wait time"
msgstr "命令最长等待时间"
-#: ../cli.py:1312
+#: ../cli.py:1310
msgid "debugging output level"
msgstr "调试输出级别"
-#: ../cli.py:1316
+#: ../cli.py:1314
msgid "show duplicates, in repos, in list/search commands"
msgstr "在 list/search 命令下，显示仓库里重复的条目。"
-#: ../cli.py:1318
+#: ../cli.py:1316
msgid "error output level"
msgstr "错误输出级别"
-#: ../cli.py:1321
+#: ../cli.py:1319
msgid "quiet operation"
msgstr "安静的操作"
-#: ../cli.py:1323
+#: ../cli.py:1321
#, fuzzy
msgid "verbose operation"
msgstr "安静的操作"
-#: ../cli.py:1325
+#: ../cli.py:1323
msgid "answer yes for all questions"
msgstr "回答所有的问题为是"
-#: ../cli.py:1327
+#: ../cli.py:1325
msgid "show Yum version and exit"
msgstr "显示 Yum 版本信息并退出"
-#: ../cli.py:1328
+#: ../cli.py:1326
msgid "set install root"
msgstr "设置目标根目录"
-#: ../cli.py:1332
+#: ../cli.py:1330
msgid "enable one or more repositories (wildcards allowed)"
msgstr "启用一个或多个仓库(支持通配符)"
-#: ../cli.py:1336
+#: ../cli.py:1334
msgid "disable one or more repositories (wildcards allowed)"
msgstr "禁用一个或多个仓库(支持通配符)"
-#: ../cli.py:1339
+#: ../cli.py:1337
msgid "exclude package(s) by name or glob"
msgstr "用全名或通配符排除软件包"
-#: ../cli.py:1341
+#: ../cli.py:1339
msgid "disable exclude from main, for a repo or for everything"
msgstr "禁止从主配置，从仓库或者从任何位置排除"
-#: ../cli.py:1344
+#: ../cli.py:1342
msgid "enable obsoletes processing during updates"
msgstr "升级时考虑软件包取代关系"
-#: ../cli.py:1346
+#: ../cli.py:1344
msgid "disable Yum plugins"
msgstr "禁用 Yum 插件"
-#: ../cli.py:1348
+#: ../cli.py:1346
msgid "disable gpg signature checking"
msgstr "禁用 gpg 签名检测"
-#: ../cli.py:1350
+#: ../cli.py:1348
msgid "disable plugins by name"
msgstr "禁用指定名称的插件"
-#: ../cli.py:1353
+#: ../cli.py:1351
#, fuzzy
msgid "enable plugins by name"
msgstr "用名称禁掉插件"
-#: ../cli.py:1356
+#: ../cli.py:1354
msgid "skip packages with depsolving problems"
msgstr "跳过有依赖问题的软件包"
-#: ../cli.py:1358
+#: ../cli.py:1356
msgid "control whether color is used"
msgstr "配置是否使用颜色"
@@ -646,7 +652,9 @@ msgstr "确定吗？[y/N]："
msgid ""
"\n"
"Group: %s"
-msgstr "\n组：%s"
+msgstr ""
+"\n"
+"组：%s"
#: ../output.py:726
#, fuzzy, python-format
@@ -883,212 +891,227 @@ msgstr "用户中断"
msgid "Total"
msgstr "总计"
-#: ../output.py:1201
+#: ../output.py:1203
msgid "<unset>"
msgstr "<空>"
-#: ../output.py:1202
+#: ../output.py:1204
msgid "System"
msgstr "系统"
-#: ../output.py:1238
+#: ../output.py:1240
msgid "Bad transaction IDs, or package(s), given"
msgstr "错误的事务 ID 或软件包"
-#: ../output.py:1282 ../yumcommands.py:1148 ../yum/__init__.py:1060
+#: ../output.py:1284 ../yumcommands.py:1149 ../yum/__init__.py:1067
msgid "Warning: RPMDB has been altered since the last yum transaction."
msgstr "警告：自上次 yum 事务以来 RPMDB 已变动。"
-#: ../output.py:1287
+#: ../output.py:1289
msgid "No transaction ID given"
msgstr "没有事务 ID"
-#: ../output.py:1295
+#: ../output.py:1297
msgid "Bad transaction ID given"
msgstr ""
-#: ../output.py:1300
+#: ../output.py:1302
#, fuzzy
msgid "Not found given transaction ID"
msgstr "运行事务处理"
-#: ../output.py:1308
+#: ../output.py:1310
msgid "Found more than one transaction ID!"
msgstr ""
-#: ../output.py:1329
+#: ../output.py:1331
msgid "No transaction ID, or package, given"
msgstr ""
-#: ../output.py:1355
+#: ../output.py:1357
#, fuzzy
msgid "Transaction ID :"
msgstr "处理检查错误:\n"
-#: ../output.py:1357
+#: ../output.py:1359
msgid "Begin time :"
msgstr ""
-#: ../output.py:1360 ../output.py:1362
+#: ../output.py:1362 ../output.py:1364
msgid "Begin rpmdb :"
msgstr ""
-#: ../output.py:1376
+#: ../output.py:1378
#, python-format
msgid "(%s seconds)"
msgstr ""
-#: ../output.py:1377
+#: ../output.py:1379
#, fuzzy
msgid "End time :"
msgstr "大小 : %s"
-#: ../output.py:1380 ../output.py:1382
+#: ../output.py:1382 ../output.py:1384
msgid "End rpmdb :"
msgstr ""
-#: ../output.py:1383
+#: ../output.py:1385
#, fuzzy
msgid "User :"
msgstr "统一资源定位符: %s"
-#: ../output.py:1385 ../output.py:1387 ../output.py:1389
+#: ../output.py:1387 ../output.py:1389 ../output.py:1391
msgid "Return-Code :"
msgstr ""
-#: ../output.py:1385
+#: ../output.py:1387
#, fuzzy
msgid "Aborted"
msgstr "已废弃"
-#: ../output.py:1387
+#: ../output.py:1389
msgid "Failure:"
msgstr ""
-#: ../output.py:1389
+#: ../output.py:1391
msgid "Success"
msgstr ""
-#: ../output.py:1390
+#: ../output.py:1392
#, fuzzy
-msgid "Transaction performed with :"
+msgid "Transaction performed with:"
msgstr "处理检查错误:\n"
-#: ../output.py:1403
+#: ../output.py:1405
msgid "Downgraded"
msgstr ""
#. multiple versions installed, both older and newer
-#: ../output.py:1405
+#: ../output.py:1407
msgid "Weird"
msgstr ""
-#: ../output.py:1407
+#: ../output.py:1409
#, fuzzy
msgid "Packages Altered:"
msgstr "没有可提供的包"
-#: ../output.py:1475
+#: ../output.py:1412
+msgid "Scriptlet output:"
+msgstr ""
+
+#: ../output.py:1418
+#, fuzzy
+msgid "Errors:"
+msgstr "错误：%s"
+
+#: ../output.py:1489
msgid "Last day"
msgstr ""
-#: ../output.py:1476
+#: ../output.py:1490
msgid "Last week"
msgstr ""
-#: ../output.py:1477
+#: ../output.py:1491
msgid "Last 2 weeks"
msgstr ""
#. US default :p
-#: ../output.py:1478
+#: ../output.py:1492
msgid "Last 3 months"
msgstr ""
-#: ../output.py:1479
+#: ../output.py:1493
msgid "Last 6 months"
msgstr ""
-#: ../output.py:1480
+#: ../output.py:1494
msgid "Last year"
msgstr ""
-#: ../output.py:1481
+#: ../output.py:1495
msgid "Over a year ago"
msgstr ""
-#: ../output.py:1510
+#: ../output.py:1524
msgid "installed"
msgstr "安装"
-#: ../output.py:1511
+#: ../output.py:1525
msgid "updated"
msgstr "升级"
-#: ../output.py:1512
+#: ../output.py:1526
msgid "obsoleted"
msgstr "取代"
-#: ../output.py:1513
+#: ../output.py:1527
msgid "erased"
msgstr "删除"
-#: ../output.py:1517
+#: ../output.py:1531
#, python-format
msgid "---> Package %s.%s %s:%s-%s set to be %s"
msgstr "---> 软件包 %s.%s %s:%s-%s 将被 %s"
-#: ../output.py:1524
+#: ../output.py:1538
msgid "--> Running transaction check"
msgstr "--> 执行事务检查"
-#: ../output.py:1529
+#: ../output.py:1543
msgid "--> Restarting Dependency Resolution with new changes."
msgstr "--> 使用新的信息重新计算依赖关系"
-#: ../output.py:1534
+#: ../output.py:1548
msgid "--> Finished Dependency Resolution"
msgstr "--> 完成依赖关系计算"
-#: ../output.py:1539 ../output.py:1544
+#: ../output.py:1553 ../output.py:1558
#, python-format
msgid "--> Processing Dependency: %s for package: %s"
msgstr "--> 处理依赖关系 %s，它被软件包 %s 需要"
-#: ../output.py:1548
+#: ../output.py:1562
#, python-format
msgid "--> Unresolved Dependency: %s"
msgstr "--> 无法解决的依赖：%s"
-#: ../output.py:1554 ../output.py:1559
+#: ../output.py:1568 ../output.py:1573
#, python-format
msgid "--> Processing Conflict: %s conflicts %s"
msgstr "--> 处理 %s 与 %s 的冲突"
-#: ../output.py:1563
+#: ../output.py:1577
msgid "--> Populating transaction set with selected packages. Please wait."
msgstr "--> 根据指定的软件包创建事务，请等待。"
-#: ../output.py:1567
+#: ../output.py:1581
#, python-format
msgid "---> Downloading header for %s to pack into transaction set."
msgstr "---> 下载 %s 的文件头作为事务的一部分。"
-#: ../utils.py:132 ../yummain.py:42
+#: ../utils.py:137 ../yummain.py:42
msgid ""
"\n"
"\n"
"Exiting on user cancel"
-msgstr "\n\n由于用户取消而退出"
+msgstr ""
+"\n"
+"\n"
+"由于用户取消而退出"
-#: ../utils.py:138 ../yummain.py:48
+#: ../utils.py:143 ../yummain.py:48
msgid ""
"\n"
"\n"
"Exiting on Broken Pipe"
-msgstr "\n\n由于管道被破坏而退出"
+msgstr ""
+"\n"
+"\n"
+"由于管道被破坏而退出"
-#: ../utils.py:140 ../yummain.py:50
+#: ../utils.py:145 ../yummain.py:50
#, fuzzy, python-format
msgid ""
"\n"
@@ -1096,7 +1119,7 @@ msgid ""
"%s"
msgstr "%s"
-#: ../utils.py:179 ../yummain.py:273
+#: ../utils.py:184 ../yummain.py:273
msgid "Complete!"
msgstr "完毕！"
@@ -1122,11 +1145,13 @@ msgid ""
"For more information contact your distribution or package provider.\n"
msgstr ""
"\n"
-"您启用了软件包 GPG 签名检测，这样很好。但是，您尚未安装任何 GPG 公钥。请下载您希望安装的软件的签名公钥并安装。假设公钥已下载，安装命令是：\n"
+"您启用了软件包 GPG 签名检测，这样很好。但是，您尚未安装任何 GPG 公钥。请下载"
+"您希望安装的软件的签名公钥并安装。假设公钥已下载，安装命令是：\n"
" rpm --import public.gpg.key\n"
"\n"
"\n"
-"或者，在仓库配置中，使用 'gpgkey' 选项指定仓库使用的公钥的 URL，这样 yum 会自动安装它。\n"
+"或者，在仓库配置中，使用 'gpgkey' 选项指定仓库使用的公钥的 URL，这样 yum 会自"
+"动安装它。\n"
"\n"
"详情请联系您的发行版或软件包制作人。\n"
@@ -1216,7 +1241,7 @@ msgid "Updated Packages"
msgstr "更新的软件包"
#. This only happens in verbose mode
-#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:602
+#: ../yumcommands.py:319 ../yumcommands.py:326 ../yumcommands.py:603
msgid "Obsoleting Packages"
msgstr "取代的软件包"
@@ -1292,256 +1317,262 @@ msgstr "查找提供指定内容的软件包"
msgid "Check for available package updates"
msgstr "检查是否有软件包更新"
-#: ../yumcommands.py:622
+#: ../yumcommands.py:623
msgid "Search package details for the given string"
msgstr "在软件包详细信息中搜索指定字符串"
-#: ../yumcommands.py:628
+#: ../yumcommands.py:629
msgid "Searching Packages: "
msgstr "搜索软件包："
-#: ../yumcommands.py:645
+#: ../yumcommands.py:646
msgid "Update packages taking obsoletes into account"
msgstr "更新软件包同时考虑软件包取代关系"
-#: ../yumcommands.py:653
+#: ../yumcommands.py:654
msgid "Setting up Upgrade Process"
msgstr "设置升级进程"
-#: ../yumcommands.py:667
+#: ../yumcommands.py:668
msgid "Install a local RPM"
msgstr "安装本地的 RPM"
-#: ../yumcommands.py:675
+#: ../yumcommands.py:676
msgid "Setting up Local Package Process"
msgstr "设置本地安装进程"
-#: ../yumcommands.py:694
+#: ../yumcommands.py:695
msgid "Determine which package provides the given dependency"
msgstr "判断哪个包提供了指定的依赖"
-#: ../yumcommands.py:697
+#: ../yumcommands.py:698
msgid "Searching Packages for Dependency:"
msgstr "查找依赖的软件包："
-#: ../yumcommands.py:711
+#: ../yumcommands.py:712
msgid "Run an interactive yum shell"
msgstr "运行交互式的 yum 外壳"
-#: ../yumcommands.py:717
+#: ../yumcommands.py:718
msgid "Setting up Yum Shell"
msgstr "设置 Yum 外壳"
-#: ../yumcommands.py:735
+#: ../yumcommands.py:736
msgid "List a package's dependencies"
msgstr "列出软件包的依赖关系"
-#: ../yumcommands.py:741
+#: ../yumcommands.py:742
msgid "Finding dependencies: "
msgstr "查找依赖："
-#: ../yumcommands.py:757
+#: ../yumcommands.py:758
msgid "Display the configured software repositories"
msgstr "显示已配置的仓库"
-#: ../yumcommands.py:809 ../yumcommands.py:810
+#: ../yumcommands.py:810 ../yumcommands.py:811
msgid "enabled"
msgstr "启用"
-#: ../yumcommands.py:818 ../yumcommands.py:819
+#: ../yumcommands.py:819 ../yumcommands.py:820
msgid "disabled"
msgstr "禁用"
-#: ../yumcommands.py:833
+#: ../yumcommands.py:834
#, fuzzy
msgid "Repo-id : "
msgstr "Repo : %s"
-#: ../yumcommands.py:834
+#: ../yumcommands.py:835
#, fuzzy
msgid "Repo-name : "
msgstr "发行 : %s"
-#: ../yumcommands.py:835
+#: ../yumcommands.py:836
msgid "Repo-status : "
msgstr ""
-#: ../yumcommands.py:837
+#: ../yumcommands.py:838
msgid "Repo-revision: "
msgstr ""
-#: ../yumcommands.py:841
+#: ../yumcommands.py:842
#, fuzzy
msgid "Repo-tags : "
msgstr "发行 : %s"
-#: ../yumcommands.py:847
+#: ../yumcommands.py:848
msgid "Repo-distro-tags: "
msgstr ""
-#: ../yumcommands.py:852
+#: ../yumcommands.py:853
#, fuzzy
msgid "Repo-updated : "
msgstr "升级"
-#: ../yumcommands.py:854
+#: ../yumcommands.py:855
#, fuzzy
msgid "Repo-pkgs : "
msgstr "Repo : %s"
-#: ../yumcommands.py:855
+#: ../yumcommands.py:856
#, fuzzy
msgid "Repo-size : "
msgstr "发行 : %s"
-#: ../yumcommands.py:862
+#: ../yumcommands.py:863
msgid "Repo-baseurl : "
msgstr ""
-#: ../yumcommands.py:870
+#: ../yumcommands.py:871
msgid "Repo-metalink: "
msgstr ""
-#: ../yumcommands.py:874
+#: ../yumcommands.py:875
#, fuzzy
msgid " Updated : "
msgstr "更新完毕"
-#: ../yumcommands.py:877
+#: ../yumcommands.py:878
msgid "Repo-mirrors : "
msgstr ""
-#: ../yumcommands.py:881 ../yummain.py:133
+#: ../yumcommands.py:882 ../yummain.py:133
msgid "Unknown"
msgstr ""
-#: ../yumcommands.py:887
+#: ../yumcommands.py:888
#, python-format
msgid "Never (last: %s)"
msgstr ""
-#: ../yumcommands.py:889
+#: ../yumcommands.py:890
#, python-format
msgid "Instant (last: %s)"
msgstr ""
-#: ../yumcommands.py:892
+#: ../yumcommands.py:893
#, python-format
msgid "%s second(s) (last: %s)"
msgstr ""
-#: ../yumcommands.py:894
+#: ../yumcommands.py:895
msgid "Repo-expire : "
msgstr ""
-#: ../yumcommands.py:897
+#: ../yumcommands.py:898
msgid "Repo-exclude : "
msgstr ""
-#: ../yumcommands.py:901
+#: ../yumcommands.py:902
msgid "Repo-include : "
msgstr ""
#. Work out the first (id) and last (enabled/disalbed/count),
#. then chop the middle (name)...
-#: ../yumcommands.py:911 ../yumcommands.py:937
+#: ../yumcommands.py:912 ../yumcommands.py:938
msgid "repo id"
msgstr "仓库标识"
-#: ../yumcommands.py:925 ../yumcommands.py:926 ../yumcommands.py:940
+#: ../yumcommands.py:926 ../yumcommands.py:927 ../yumcommands.py:941
msgid "status"
msgstr "状态"
-#: ../yumcommands.py:938
+#: ../yumcommands.py:939
msgid "repo name"
msgstr "仓库名称"
-#: ../yumcommands.py:964
+#: ../yumcommands.py:965
msgid "Display a helpful usage message"
msgstr "显示用法信息"
-#: ../yumcommands.py:998
+#: ../yumcommands.py:999
#, python-format
msgid "No help available for %s"
msgstr "没有关于 %s 的帮助"
-#: ../yumcommands.py:1003
+#: ../yumcommands.py:1004
msgid ""
"\n"
"\n"
"aliases: "
-msgstr "\n\n别名："
+msgstr ""
+"\n"
+"\n"
+"别名："
-#: ../yumcommands.py:1005
+#: ../yumcommands.py:1006
msgid ""
"\n"
"\n"
"alias: "
-msgstr "\n\n别名："
+msgstr ""
+"\n"
+"\n"
+"别名："
-#: ../yumcommands.py:1033
+#: ../yumcommands.py:1034
msgid "Setting up Reinstall Process"
msgstr "设置覆盖安装进程"
-#: ../yumcommands.py:1041
+#: ../yumcommands.py:1042
msgid "reinstall a package"
msgstr "覆盖安装一个包"
-#: ../yumcommands.py:1059
+#: ../yumcommands.py:1060
#, fuzzy
msgid "Setting up Downgrade Process"
msgstr "设置升级进程"
-#: ../yumcommands.py:1066
+#: ../yumcommands.py:1067
#, fuzzy
msgid "downgrade a package"
msgstr "重新安装一个包"
-#: ../yumcommands.py:1080
+#: ../yumcommands.py:1081
msgid "Display a version for the machine and/or available repos."
msgstr ""
-#: ../yumcommands.py:1110
+#: ../yumcommands.py:1111
msgid " Yum version groups:"
msgstr ""
-#: ../yumcommands.py:1120
+#: ../yumcommands.py:1121
#, fuzzy
msgid " Group :"
msgstr ""
"\n"
"组: %s"
-#: ../yumcommands.py:1121
+#: ../yumcommands.py:1122
#, fuzzy
msgid " Packages:"
msgstr "包"
-#: ../yumcommands.py:1151
+#: ../yumcommands.py:1152
#, fuzzy
msgid "Installed:"
msgstr "已安装"
-#: ../yumcommands.py:1156
+#: ../yumcommands.py:1157
#, fuzzy
msgid "Group-Installed:"
msgstr "已安装"
-#: ../yumcommands.py:1165
+#: ../yumcommands.py:1166
#, fuzzy
msgid "Available:"
msgstr "有效的组:"
-#: ../yumcommands.py:1171
+#: ../yumcommands.py:1172
#, fuzzy
msgid "Group-Available:"
msgstr "有效的组:"
-#: ../yumcommands.py:1210
+#: ../yumcommands.py:1211
msgid "Display, or use, the transaction history"
msgstr ""
-#: ../yumcommands.py:1238
+#: ../yumcommands.py:1239
#, python-format
msgid "Invalid history sub-command, use: %s."
msgstr ""
@@ -1625,154 +1656,159 @@ msgstr ""
msgid ""
"\n"
"Dependencies Resolved"
-msgstr "\n依赖关系解决"
+msgstr ""
+"\n"
+"依赖关系解决"
#: ../yummain.py:326
msgid ""
"\n"
"\n"
"Exiting on user cancel."
-msgstr "\n\n由于用户取消而退出。"
+msgstr ""
+"\n"
+"\n"
+"由于用户取消而退出。"
-#: ../yum/depsolve.py:83
+#: ../yum/depsolve.py:82
msgid "doTsSetup() will go away in a future version of Yum.\n"
msgstr "doTsSetup() 将从未来版本的 Yum 中去掉。\n"
-#: ../yum/depsolve.py:98
+#: ../yum/depsolve.py:97
msgid "Setting up TransactionSets before config class is up"
msgstr "在配置可用前设置事务集"
-#: ../yum/depsolve.py:149
+#: ../yum/depsolve.py:148
#, python-format
msgid "Invalid tsflag in config file: %s"
msgstr "配置文件 %s 中使用 tsflag 是错误的"
-#: ../yum/depsolve.py:160
+#: ../yum/depsolve.py:159
#, python-format
msgid "Searching pkgSack for dep: %s"
msgstr "搜索群集中 %s 的依赖关系"
-#: ../yum/depsolve.py:176
+#: ../yum/depsolve.py:175
#, python-format
msgid "Potential match for %s from %s"
msgstr "可能满足 %s 的软件包：%s"
-#: ../yum/depsolve.py:184
+#: ../yum/depsolve.py:183
#, python-format
msgid "Matched %s to require for %s"
msgstr "确认 %s 满足 %s 的要求"
-#: ../yum/depsolve.py:225
+#: ../yum/depsolve.py:224
#, python-format
msgid "Member: %s"
msgstr "成员：%s"
-#: ../yum/depsolve.py:239 ../yum/depsolve.py:749
+#: ../yum/depsolve.py:238 ../yum/depsolve.py:749
#, python-format
msgid "%s converted to install"
msgstr "%s 转为安装"
-#: ../yum/depsolve.py:246
+#: ../yum/depsolve.py:245
#, python-format
msgid "Adding Package %s in mode %s"
msgstr "添加软件包 %s 到 %s 模式"
-#: ../yum/depsolve.py:256
+#: ../yum/depsolve.py:255
#, python-format
msgid "Removing Package %s"
msgstr "正在删除软件包 %s"
-#: ../yum/depsolve.py:278
+#: ../yum/depsolve.py:277
#, python-format
msgid "%s requires: %s"
msgstr "%s 需要：%s"
-#: ../yum/depsolve.py:336
+#: ../yum/depsolve.py:335
msgid "Needed Require has already been looked up, cheating"
msgstr "已查询过所需的依赖关系，跳过"
-#: ../yum/depsolve.py:346
+#: ../yum/depsolve.py:345
#, python-format
msgid "Needed Require is not a package name. Looking up: %s"
msgstr "所需的依赖关系并非软件包名称。搜索：%s"
-#: ../yum/depsolve.py:353
+#: ../yum/depsolve.py:352
#, python-format
msgid "Potential Provider: %s"
msgstr " 可能的提供者：%s"
-#: ../yum/depsolve.py:376
+#: ../yum/depsolve.py:375
#, python-format
msgid "Mode is %s for provider of %s: %s"
msgstr "模式 %s 被用于提供 %s 的软件包：%s"
-#: ../yum/depsolve.py:380
+#: ../yum/depsolve.py:379
#, python-format
msgid "Mode for pkg providing %s: %s"
msgstr "提供 %s 的软件包使用的模式：%s"
-#: ../yum/depsolve.py:384
+#: ../yum/depsolve.py:383
#, python-format
msgid "TSINFO: %s package requiring %s marked as erase"
msgstr "事务：%s 软件包要求删除 %s"
-#: ../yum/depsolve.py:397
+#: ../yum/depsolve.py:396
#, python-format
msgid "TSINFO: Obsoleting %s with %s to resolve dep."
msgstr "事务：令 %s 被 %s 取代以解决依赖关系。"
-#: ../yum/depsolve.py:400
+#: ../yum/depsolve.py:399
#, python-format
msgid "TSINFO: Updating %s to resolve dep."
msgstr "事务：更新 %s 以解决依赖。"
-#: ../yum/depsolve.py:408
+#: ../yum/depsolve.py:407
#, python-format
msgid "Cannot find an update path for dep for: %s"
msgstr "无法找到 %s 依赖的更新路径"
-#: ../yum/depsolve.py:418
+#: ../yum/depsolve.py:417
#, python-format
msgid "Unresolvable requirement %s for %s"
msgstr "%s 这一要求无法解决，可怜的 %s"
-#: ../yum/depsolve.py:441
+#: ../yum/depsolve.py:440
#, fuzzy, python-format
msgid "Quick matched %s to require for %s"
msgstr "标志%s 要求 %s"
#. is it already installed?
-#: ../yum/depsolve.py:483
+#: ../yum/depsolve.py:482
#, python-format
msgid "%s is in providing packages but it is already installed, removing."
msgstr "提供 %s 的软件包存在而且已被安装，不再检测。"
-#: ../yum/depsolve.py:499
+#: ../yum/depsolve.py:498
#, python-format
msgid "Potential resolving package %s has newer instance in ts."
msgstr "可能解决依赖的 %s 软件包已经有更新的版本存在于事务中了。"
-#: ../yum/depsolve.py:510
+#: ../yum/depsolve.py:509
#, python-format
msgid "Potential resolving package %s has newer instance installed."
msgstr "可能解决依赖的 %s 软件包已经有更新的版本安装过了。"
-#: ../yum/depsolve.py:518 ../yum/depsolve.py:564
+#: ../yum/depsolve.py:517 ../yum/depsolve.py:563
#, python-format
msgid "Missing Dependency: %s is needed by package %s"
msgstr "无法满足的依赖关系：%s 被包 %s 所需要"
-#: ../yum/depsolve.py:531
+#: ../yum/depsolve.py:530
#, python-format
msgid "%s already in ts, skipping this one"
msgstr "%s 已包含在事务中，不再重复"
-#: ../yum/depsolve.py:574
+#: ../yum/depsolve.py:573
#, python-format
msgid "TSINFO: Marking %s as update for %s"
msgstr "事务：将 %s 作为 %s 的更新"
-#: ../yum/depsolve.py:582
+#: ../yum/depsolve.py:581
#, python-format
msgid "TSINFO: Marking %s as install for %s"
msgstr "事务：将 %s 作为 %s 安装"
@@ -1946,78 +1982,80 @@ msgstr "尝试了 %i 轮跳过错误的软件包"
msgid ""
"\n"
"Packages skipped because of dependency problems:"
-msgstr "\n因为依赖关系问题而跳过的软件包："
+msgstr ""
+"\n"
+"因为依赖关系问题而跳过的软件包："
#: ../yum/__init__.py:911
#, python-format
msgid " %s from %s"
msgstr " %s 来自 %s"
-#: ../yum/__init__.py:1076
+#: ../yum/__init__.py:1083
msgid ""
"Warning: scriptlet or other non-fatal errors occurred during transaction."
msgstr ""
-#: ../yum/__init__.py:1093
+#: ../yum/__init__.py:1101
#, python-format
msgid "Failed to remove transaction file %s"
msgstr "移除事务文件 %s 失败"
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1122
+#: ../yum/__init__.py:1130
#, python-format
msgid "%s was supposed to be installed but is not!"
msgstr ""
#. maybe a file log here, too
#. but raising an exception is not going to do any good
-#: ../yum/__init__.py:1161
+#: ../yum/__init__.py:1169
#, python-format
msgid "%s was supposed to be removed but is not!"
msgstr ""
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1281
+#: ../yum/__init__.py:1289
#, python-format
msgid "Unable to check if PID %s is active"
msgstr "无法检测 PID %s 是否激活"
#. Another copy seems to be running.
-#: ../yum/__init__.py:1285
+#: ../yum/__init__.py:1293
#, python-format
msgid "Existing lock %s: another copy is running as pid %s."
msgstr "%s 已被锁定，PID 为 %s 的另一个程序正在运行。"
#. Whoa. What the heck happened?
-#: ../yum/__init__.py:1320
+#: ../yum/__init__.py:1328
#, fuzzy, python-format
msgid "Could not create lock at %s: %s "
msgstr "不能找到和 %s 匹配的升级"
-#: ../yum/__init__.py:1365
+#: ../yum/__init__.py:1373
msgid "Package does not match intended download"
msgstr "软件包不符合需要下载的内容。"
-#: ../yum/__init__.py:1380
+#: ../yum/__init__.py:1388
msgid "Could not perform checksum"
msgstr "无法执行校验和"
-#: ../yum/__init__.py:1383
+#: ../yum/__init__.py:1391
msgid "Package does not match checksum"
msgstr "软件包校验和不匹配"
-#: ../yum/__init__.py:1425
+#: ../yum/__init__.py:1433
#, python-format
msgid "package fails checksum but caching is enabled for %s"
msgstr "软件包校验和失败但是 %s 已启用缓存"
-#: ../yum/__init__.py:1428 ../yum/__init__.py:1457
+#: ../yum/__init__.py:1436 ../yum/__init__.py:1465
#, python-format
msgid "using local copy of %s"
msgstr "使用本地的 %s 副本"
-#: ../yum/__init__.py:1469
+#: ../yum/__init__.py:1477
#, fuzzy, python-format
msgid ""
"Insufficient space in download directory %s\n"
@@ -2025,389 +2063,392 @@ msgid ""
" * needed %s"
msgstr "目录 %s没有足够的空间下载文件"
-#: ../yum/__init__.py:1518
+#: ../yum/__init__.py:1526
msgid "Header is not complete."
msgstr "文件头不完整。"
-#: ../yum/__init__.py:1555
+#: ../yum/__init__.py:1563
#, python-format
msgid ""
"Header not in local cache and caching-only mode enabled. Cannot download %s"
msgstr "文件头不在本地缓存中，但是因为处于只使用缓存的模式，无法下载 %s"
-#: ../yum/__init__.py:1610
+#: ../yum/__init__.py:1618
#, python-format
msgid "Public key for %s is not installed"
msgstr "%s 的公钥没有安装"
-#: ../yum/__init__.py:1614
+#: ../yum/__init__.py:1622
#, python-format
msgid "Problem opening package %s"
msgstr "打开软件包 %s 出现问题"
-#: ../yum/__init__.py:1622
+#: ../yum/__init__.py:1630
#, python-format
msgid "Public key for %s is not trusted"
msgstr "%s 的公钥不可信任"
-#: ../yum/__init__.py:1626
+#: ../yum/__init__.py:1634
#, python-format
msgid "Package %s is not signed"
msgstr "软件包 %s 没有签名"
-#: ../yum/__init__.py:1664
+#: ../yum/__init__.py:1672
#, python-format
msgid "Cannot remove %s"
msgstr "无法删除 %s"
-#: ../yum/__init__.py:1668
+#: ../yum/__init__.py:1676
#, python-format
msgid "%s removed"
msgstr "%s 已删除"
-#: ../yum/__init__.py:1704
+#: ../yum/__init__.py:1712
#, python-format
msgid "Cannot remove %s file %s"
msgstr "无法删除 %s 文件 %s"
-#: ../yum/__init__.py:1708
+#: ../yum/__init__.py:1716
#, python-format
msgid "%s file %s removed"
msgstr "%s 文件 %s 已删除"
-#: ../yum/__init__.py:1710
+#: ../yum/__init__.py:1718
#, python-format
msgid "%d %s files removed"
msgstr "%d %s 文件已删除"
-#: ../yum/__init__.py:1779
+#: ../yum/__init__.py:1787
#, python-format
msgid "More than one identical match in sack for %s"
msgstr "群集中有超过一个相同的匹配 %s"
-#: ../yum/__init__.py:1785
+#: ../yum/__init__.py:1793
#, python-format
msgid "Nothing matches %s.%s %s:%s-%s from update"
msgstr "更新不包括匹配 %s.%s %s:%s-%s 的内容"
-#: ../yum/__init__.py:2018
+#: ../yum/__init__.py:2026
msgid ""
"searchPackages() will go away in a future version of "
"Yum. Use searchGenerator() instead. \n"
-msgstr "searchPackages() 将从未来版本的 Yum 中去掉，被searchGenerator() 替代。\n"
+msgstr ""
+"searchPackages() 将从未来版本的 Yum 中去掉，被searchGenerator() 替代。\n"
-#: ../yum/__init__.py:2057
+#: ../yum/__init__.py:2065
#, python-format
msgid "Searching %d packages"
msgstr "搜索 %d 个软件包"
-#: ../yum/__init__.py:2061
+#: ../yum/__init__.py:2069
#, python-format
msgid "searching package %s"
msgstr "搜索 %s 软件包"
-#: ../yum/__init__.py:2073
+#: ../yum/__init__.py:2081
msgid "searching in file entries"
msgstr "在文件中搜索"
-#: ../yum/__init__.py:2080
+#: ../yum/__init__.py:2088
msgid "searching in provides entries"
msgstr "在可提供的依赖中搜索"
-#: ../yum/__init__.py:2113
+#: ../yum/__init__.py:2121
#, python-format
msgid "Provides-match: %s"
msgstr "提供依赖满足：%s"
-#: ../yum/__init__.py:2162
+#: ../yum/__init__.py:2170
#, fuzzy
msgid "No group data available for configured repositories"
msgstr "在现有的仓库中没有组可被提供"
-#: ../yum/__init__.py:2193 ../yum/__init__.py:2212 ../yum/__init__.py:2243
-#: ../yum/__init__.py:2249 ../yum/__init__.py:2328 ../yum/__init__.py:2332
-#: ../yum/__init__.py:2647
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2220 ../yum/__init__.py:2251
+#: ../yum/__init__.py:2257 ../yum/__init__.py:2336 ../yum/__init__.py:2340
+#: ../yum/__init__.py:2655
#, python-format
msgid "No Group named %s exists"
msgstr "不存在 %s 组"
-#: ../yum/__init__.py:2224 ../yum/__init__.py:2345
+#: ../yum/__init__.py:2232 ../yum/__init__.py:2353
#, python-format
msgid "package %s was not marked in group %s"
msgstr "软件包 %s 没有包含在 %s 组中"
-#: ../yum/__init__.py:2271
+#: ../yum/__init__.py:2279
#, python-format
msgid "Adding package %s from group %s"
msgstr "添加包 %s 从组 %s 中"
-#: ../yum/__init__.py:2275
+#: ../yum/__init__.py:2283
#, python-format
msgid "No package named %s available to be installed"
msgstr "找不到名为 %s 的软件包来安装"
-#: ../yum/__init__.py:2372
+#: ../yum/__init__.py:2380
#, python-format
msgid "Package tuple %s could not be found in packagesack"
msgstr "群集中找不到软件包 %s"
-#: ../yum/__init__.py:2391
+#: ../yum/__init__.py:2399
#, fuzzy, python-format
msgid "Package tuple %s could not be found in rpmdb"
msgstr "rpmdb 中找不到软件包 %s"
-#: ../yum/__init__.py:2447 ../yum/__init__.py:2497
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2505
msgid "Invalid version flag"
msgstr "无效的版本标志"
-#: ../yum/__init__.py:2467 ../yum/__init__.py:2472
+#: ../yum/__init__.py:2475 ../yum/__init__.py:2480
#, python-format
msgid "No Package found for %s"
msgstr "找不到 %s 软件包"
-#: ../yum/__init__.py:2688
+#: ../yum/__init__.py:2696
msgid "Package Object was not a package object instance"
msgstr "不是一个软件包对象的实例"
-#: ../yum/__init__.py:2692
+#: ../yum/__init__.py:2700
msgid "Nothing specified to install"
msgstr "没有指定要安装的内容"
-#: ../yum/__init__.py:2708 ../yum/__init__.py:3472
+#: ../yum/__init__.py:2716 ../yum/__init__.py:3489
#, python-format
msgid "Checking for virtual provide or file-provide for %s"
msgstr "检测 %s 提供的依赖或文件"
-#: ../yum/__init__.py:2714 ../yum/__init__.py:3021 ../yum/__init__.py:3188
-#: ../yum/__init__.py:3478
+#: ../yum/__init__.py:2722 ../yum/__init__.py:3037 ../yum/__init__.py:3205
+#: ../yum/__init__.py:3495
#, python-format
msgid "No Match for argument: %s"
msgstr "参数 %s 没有匹配"
-#: ../yum/__init__.py:2790
+#: ../yum/__init__.py:2798
#, fuzzy, python-format
msgid "Package %s installed and not available"
msgstr "包 %s 已安装并且是最新版本"
-#: ../yum/__init__.py:2793
+#: ../yum/__init__.py:2801
msgid "No package(s) available to install"
msgstr "没有包可供安装"
-#: ../yum/__init__.py:2805
+#: ../yum/__init__.py:2813
#, python-format
msgid "Package: %s - already in transaction set"
msgstr "软件包 %s 已包含在事务中"
-#: ../yum/__init__.py:2831
+#: ../yum/__init__.py:2839
#, fuzzy, python-format
msgid "Package %s is obsoleted by %s which is already installed"
msgstr "包 %s 早已安装，忽略"
-#: ../yum/__init__.py:2834
+#: ../yum/__init__.py:2842
#, fuzzy, python-format
msgid "Package %s is obsoleted by %s, trying to install %s instead"
msgstr "包 %s 没有安装, 不能安装。请适用yum install 安装它。"
-#: ../yum/__init__.py:2842
+#: ../yum/__init__.py:2850
#, python-format
msgid "Package %s already installed and latest version"
msgstr "包 %s 已安装并且是最新版本"
-#: ../yum/__init__.py:2856
+#: ../yum/__init__.py:2864
#, python-format
msgid "Package matching %s already installed. Checking for update."
msgstr "匹配 %s 的软件包已经安装。检查更新。"
#. update everything (the easy case)
-#: ../yum/__init__.py:2950
+#: ../yum/__init__.py:2966
msgid "Updating Everything"
msgstr "全部升级"
-#: ../yum/__init__.py:2971 ../yum/__init__.py:3086 ../yum/__init__.py:3115
-#: ../yum/__init__.py:3142
+#: ../yum/__init__.py:2987 ../yum/__init__.py:3102 ../yum/__init__.py:3129
+#: ../yum/__init__.py:3155
#, python-format
msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
msgstr "不更新已被取代的软件包：%s.%s %s:%s-%s"
-#: ../yum/__init__.py:3006 ../yum/__init__.py:3185
+#: ../yum/__init__.py:3022 ../yum/__init__.py:3202
#, python-format
msgid "%s"
msgstr "%s"
-#: ../yum/__init__.py:3077
+#: ../yum/__init__.py:3093
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
msgstr "包已被取代：%s.%s %s:%s-%s"
-#: ../yum/__init__.py:3110
+#: ../yum/__init__.py:3124
#, fuzzy, python-format
msgid "Not Updating Package that is obsoleted: %s"
msgstr "不可更新早已被废弃的包: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3119 ../yum/__init__.py:3146
+#: ../yum/__init__.py:3133 ../yum/__init__.py:3159
#, fuzzy, python-format
msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
msgstr "不可更新早已被废弃的包: %s.%s %s:%s-%s"
-#: ../yum/__init__.py:3201
+#: ../yum/__init__.py:3218
msgid "No package matched to remove"
msgstr "没有匹配的要删除的包"
-#: ../yum/__init__.py:3234 ../yum/__init__.py:3338 ../yum/__init__.py:3427
+#: ../yum/__init__.py:3251 ../yum/__init__.py:3349 ../yum/__init__.py:3432
#, python-format
msgid "Cannot open file: %s. Skipping."
msgstr "无法打开文件：%s。跳过。"
-#: ../yum/__init__.py:3237 ../yum/__init__.py:3341 ../yum/__init__.py:3430
+#: ../yum/__init__.py:3254 ../yum/__init__.py:3352 ../yum/__init__.py:3435
#, python-format
msgid "Examining %s: %s"
msgstr "诊断 %s: %s"
-#: ../yum/__init__.py:3245 ../yum/__init__.py:3344 ../yum/__init__.py:3433
+#: ../yum/__init__.py:3262 ../yum/__init__.py:3355 ../yum/__init__.py:3438
#, python-format
msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
msgstr ""
-#: ../yum/__init__.py:3253
+#: ../yum/__init__.py:3270
#, python-format
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
msgstr "软件包 %s 没有安装，不能更新。运行 yum install 安装它。"
-#: ../yum/__init__.py:3288 ../yum/__init__.py:3355 ../yum/__init__.py:3444
+#: ../yum/__init__.py:3299 ../yum/__init__.py:3360 ../yum/__init__.py:3443
#, python-format
msgid "Excluding %s"
msgstr "排除 %s"
-#: ../yum/__init__.py:3293
+#: ../yum/__init__.py:3304
#, python-format
msgid "Marking %s to be installed"
msgstr "%s 将被安装"
-#: ../yum/__init__.py:3299
+#: ../yum/__init__.py:3310
#, python-format
msgid "Marking %s as an update to %s"
msgstr "%s 将作为 %s 的更新"
-#: ../yum/__init__.py:3306
+#: ../yum/__init__.py:3317
#, python-format
msgid "%s: does not update installed package."
msgstr "%s：不更新已安装的软件包。"
-#: ../yum/__init__.py:3374
+#: ../yum/__init__.py:3379
msgid "Problem in reinstall: no package matched to remove"
msgstr "覆盖安装出错：没有匹配的要删除的软件包"
-#: ../yum/__init__.py:3387 ../yum/__init__.py:3506
+#: ../yum/__init__.py:3392 ../yum/__init__.py:3523
#, python-format
msgid "Package %s is allowed multiple installs, skipping"
msgstr "软件包 %s 允许同时安装多个版本，跳过"
-#: ../yum/__init__.py:3408
+#: ../yum/__init__.py:3413
#, fuzzy, python-format
msgid "Problem in reinstall: no package %s matched to install"
msgstr "Problem in reinstall: no package matched to install"
-#: ../yum/__init__.py:3498
+#: ../yum/__init__.py:3515
#, fuzzy
msgid "No package(s) available to downgrade"
msgstr "没有包可供安装."
-#: ../yum/__init__.py:3542
+#: ../yum/__init__.py:3559
#, fuzzy, python-format
msgid "No Match for available package: %s"
msgstr "检查可提供的包升级"
-#: ../yum/__init__.py:3548
+#: ../yum/__init__.py:3565
#, fuzzy, python-format
msgid "Only Upgrade available on package: %s"
msgstr "检查可提供的包升级"
-#: ../yum/__init__.py:3616 ../yum/__init__.py:3653
+#: ../yum/__init__.py:3635 ../yum/__init__.py:3672
#, fuzzy, python-format
msgid "Failed to downgrade: %s"
msgstr "总共下载大小: %s"
-#: ../yum/__init__.py:3685
+#: ../yum/__init__.py:3704
#, python-format
msgid "Retrieving GPG key from %s"
msgstr "从 %s 获取 GPG 密钥"
-#: ../yum/__init__.py:3705
+#: ../yum/__init__.py:3724
msgid "GPG key retrieval failed: "
msgstr "获取 GPG 密钥失败："
-#: ../yum/__init__.py:3716
+#: ../yum/__init__.py:3735
#, fuzzy, python-format
msgid "GPG key parsing failed: key does not have value %s"
msgstr "分析GPG密钥失败: "
-#: ../yum/__init__.py:3748
+#: ../yum/__init__.py:3767
#, python-format
msgid "GPG key at %s (0x%s) is already installed"
msgstr "%s 的 GPG 密钥(0x%s)已安装"
#. Try installing/updating GPG key
-#: ../yum/__init__.py:3753 ../yum/__init__.py:3815
+#: ../yum/__init__.py:3772 ../yum/__init__.py:3834
#, python-format
msgid "Importing GPG key 0x%s \"%s\" from %s"
msgstr "导入 GPG 密钥 0x%s \"%s\"，来自 %s"
-#: ../yum/__init__.py:3770
+#: ../yum/__init__.py:3789
msgid "Not installing key"
msgstr "没有安装密钥"
-#: ../yum/__init__.py:3776
+#: ../yum/__init__.py:3795
#, python-format
msgid "Key import failed (code %d)"
msgstr "导入密钥失败(代码 %d)"
-#: ../yum/__init__.py:3777 ../yum/__init__.py:3836
+#: ../yum/__init__.py:3796 ../yum/__init__.py:3855
msgid "Key imported successfully"
msgstr "导入密钥成功"
-#: ../yum/__init__.py:3782 ../yum/__init__.py:3841
+#: ../yum/__init__.py:3801 ../yum/__init__.py:3860
#, python-format
msgid ""
"The GPG keys listed for the \"%s\" repository are already installed but they "
"are not correct for this package.\n"
"Check that the correct key URLs are configured for this repository."
-msgstr "仓库 \"%s\" 的 GPG 密钥已安装，但是不适用于此软件包。请检查仓库的公钥 URL 是否配置正确。"
+msgstr ""
+"仓库 \"%s\" 的 GPG 密钥已安装，但是不适用于此软件包。请检查仓库的公钥 URL 是"
+"否配置正确。"
-#: ../yum/__init__.py:3791
+#: ../yum/__init__.py:3810
msgid "Import of key(s) didn't help, wrong key(s)?"
msgstr "导入的密钥没有用处，错误的密钥?"
-#: ../yum/__init__.py:3810
+#: ../yum/__init__.py:3829
#, fuzzy, python-format
msgid "GPG key at %s (0x%s) is already imported"
msgstr "GPG密钥在 %s (0x%s) 已经安装"
-#: ../yum/__init__.py:3830
+#: ../yum/__init__.py:3849
#, fuzzy, python-format
msgid "Not installing key for repo %s"
msgstr "没有安装密钥"
-#: ../yum/__init__.py:3835
+#: ../yum/__init__.py:3854
#, fuzzy
msgid "Key import failed"
msgstr "导入密钥失败 (代号 %d)"
-#: ../yum/__init__.py:3957
+#: ../yum/__init__.py:3976
msgid "Unable to find a suitable mirror."
msgstr "不能发现合适的镜像。"
-#: ../yum/__init__.py:3959
+#: ../yum/__init__.py:3978
msgid "Errors were encountered while downloading packages."
msgstr "下载软件包时出错。"
-#: ../yum/__init__.py:4009
+#: ../yum/__init__.py:4028
#, fuzzy, python-format
msgid "Please report this error at %s"
msgstr "请报告这个错误给 Bugzilla"
-#: ../yum/__init__.py:4033
+#: ../yum/__init__.py:4052
msgid "Test Transaction Errors: "
msgstr "事务测试出错："
diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index edfc707..b334750 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -112,7 +112,7 @@ def canCoinstall(arch1, arch2):
def archDifference(myarch, targetarch):
if myarch == targetarch:
return 1
- if arches.has_key(myarch):
+ if myarch in arches:
ret = archDifference(arches[myarch], targetarch)
if ret != 0:
return ret + 1
@@ -127,13 +127,13 @@ def isMultiLibArch(arch=None):
if arch is None:
arch = canonArch
- if not arches.has_key(arch): # or we could check if it is noarch
+ if arch not in arches: # or we could check if it is noarch
return 0
- if multilibArches.has_key(arch):
+ if arch in multilibArches:
return 1
- if multilibArches.has_key(arches[arch]):
+ if arches[arch] in multilibArches:
return 1
return 0
@@ -188,7 +188,7 @@ def getArchList(thisarch=None):
thisarch = canonArch
archlist = [thisarch]
- while arches.has_key(thisarch):
+ while thisarch in arches:
thisarch = arches[thisarch]
archlist.append(thisarch)
@@ -330,9 +330,9 @@ canonArch = getCanonArch()
# this gets you the "compat" arch of a biarch pair
def getMultiArchInfo(arch = canonArch):
- if multilibArches.has_key(arch):
+ if arch in multilibArches:
return multilibArches[arch]
- if arches.has_key(arch) and arches[arch] != "noarch":
+ if arch in arches and arches[arch] != "noarch":
return getMultiArchInfo(arch = arches[arch])
return None
@@ -361,7 +361,7 @@ def getBaseArch(myarch=None):
if not myarch:
myarch = canonArch
- if not arches.has_key(myarch): # this is dumb, but <shrug>
+ if myarch not in arches: # this is dumb, but <shrug>
return myarch
if myarch.startswith("sparc64"):
@@ -370,12 +370,12 @@ def getBaseArch(myarch=None):
return "ppc"
if isMultiLibArch(arch=myarch):
- if multilibArches.has_key(myarch):
+ if myarch in multilibArches:
return myarch
else:
return arches[myarch]
- if arches.has_key(myarch):
+ if myarch in arches:
basearch = myarch
value = arches[basearch]
while value != 'noarch':
diff --git a/rpmUtils/transaction.py b/rpmUtils/transaction.py
index 64a272f..329de69 100644
--- a/rpmUtils/transaction.py
+++ b/rpmUtils/transaction.py
@@ -122,11 +122,13 @@ class TransactionWrapper:
# prebuild the req dict
for h in mi:
+ if h['name'] == 'gpg-pubkey':
+ continue
if not h[rpm.RPMTAG_REQUIRENAME]:
continue
tup = miscutils.pkgTupleFromHeader(h)
for r in h[rpm.RPMTAG_REQUIRENAME]:
- if not req.has_key(r):
+ if r not in req:
req[r] = set()
req[r].add(tup)
@@ -144,6 +146,8 @@ class TransactionWrapper:
yield prov
for h in mi:
+ if h['name'] == 'gpg-pubkey':
+ continue
preq = 0
tup = miscutils.pkgTupleFromHeader(h)
for p in _return_all_provides(h):
diff --git a/rpmUtils/updates.py b/rpmUtils/updates.py
index 3264956..68dee45 100644
--- a/rpmUtils/updates.py
+++ b/rpmUtils/updates.py
@@ -67,7 +67,7 @@ class Updates:
def _delFromDict(self, dict_, keys, value):
for key in keys:
- if not dict_.has_key(key):
+ if key not in dict_:
continue
dict_[key] = filter(value.__ne__, dict_[key])
if not dict_[key]:
@@ -343,7 +343,7 @@ class Updates:
if a is None: # the None archs are only for lookups
continue
- if self.installdict.has_key((n, None)):
+ if (n, None) in self.installdict:
installarchs = []
availarchs = []
for (a, e, v ,r) in newpkgs[(n, None)]:
@@ -440,7 +440,7 @@ class Updates:
hapdict = self.makeNADict(highestavailablepkgs, 0)
for (n, a) in hipdict:
- if hapdict.has_key((n, a)):
+ if (n, a) in hapdict:
self.debugprint('processing %s.%s' % (n, a))
# we've got a match - get our versions and compare
(rpm_e, rpm_v, rpm_r) = hipdict[(n, a)][0] # only ever going to be first one
@@ -674,7 +674,7 @@ class Updates:
inst[pkgtup] = 1
for pkgtup in self.available:
- if not updates.has_key(pkgtup) and not inst.has_key(pkgtup):
+ if pkgtup not in updates and pkgtup not in inst:
tmplist.append(pkgtup)
returnlist = self.reduceListByNameArch(tmplist, name, arch)
diff --git a/test/operationstests.py b/test/operationstests.py
index 18f4b84..5a50439 100644
--- a/test/operationstests.py
+++ b/test/operationstests.py
@@ -141,3 +141,133 @@ class KernelTests(OperationsTests):
p = self.pkgs
res, msg = self.runOperation(['install','kernel-2.6.23.8'], p.inst, p.avail)
self.assertResult(p.inst)
+
+class MultiLibTests(OperationsTests):
+
+ @staticmethod
+ def buildPkgs(pkgs, *args):
+ pkgs.inst = []
+ pkgs.i_foo_1_12_x = FakePackage('foo', '1', '12',arch='x86_64')
+ pkgs.i_wbar_1_12_i = FakePackage('wbar', '1', '12', arch='i586')
+ pkgs.inst.append(pkgs.i_foo_1_12_x)
+ pkgs.inst.append(pkgs.i_wbar_1_12_i)
+
+ pkgs.avail = []
+ pkgs.a_foo_0_2_x = FakePackage('foo', '0', '2', arch='x86_64')
+ pkgs.a_foo_0_2_i = FakePackage('foo', '0', '2', arch='i686')
+ pkgs.a_foo_1_12_x = FakePackage('foo', '1', '12', arch='x86_64')
+ pkgs.a_foo_1_12_i = FakePackage('foo', '1', '12', arch='i686')
+ pkgs.a_foo_2_22_x = FakePackage('foo', '2', '22', arch='x86_64')
+ pkgs.a_foo_2_22_i = FakePackage('foo', '2', '22', arch='i686')
+ pkgs.a_bar_1_12_x = FakePackage('bar', '1', '12', arch='x86_64')
+ pkgs.a_bar_1_12_i = FakePackage('bar', '1', '12', arch='i686')
+ pkgs.a_bar_2_22_x = FakePackage('bar', '2', '22', arch='x86_64')
+ pkgs.a_bar_2_22_i = FakePackage('bar', '2', '22', arch='i686')
+
+ # ibar is .i?86 older
+ pkgs.a_ibar_2_22_x = FakePackage('ibar', '2', '22', arch='x86_64')
+ pkgs.a_ibar_1_12_i = FakePackage('ibar', '1', '12', arch='i686')
+
+ # xbar is .x86_64 older
+ pkgs.a_xbar_1_12_x = FakePackage('xbar', '1', '12', arch='x86_64')
+ pkgs.a_xbar_2_22_i = FakePackage('xbar', '2', '22', arch='i686')
+
+ # wbar is arch changing update/downgrade
+ pkgs.a_wbar_0_2_i = FakePackage('wbar', '0', '2', arch='i386')
+ pkgs.a_wbar_2_22_i = FakePackage('wbar', '2', '22', arch='i686')
+
+ for i in ('a_foo_0_2', 'a_foo_1_12', 'a_foo_2_22',
+ 'a_bar_1_12', 'a_bar_2_22'):
+ pkgs.avail.append(getattr(pkgs, i + '_x'))
+ pkgs.avail.append(getattr(pkgs, i + '_i'))
+ pkgs.avail.append(pkgs.a_ibar_2_22_x)
+ pkgs.avail.append(pkgs.a_ibar_1_12_i)
+ pkgs.avail.append(pkgs.a_xbar_1_12_x)
+ pkgs.avail.append(pkgs.a_xbar_2_22_i)
+ pkgs.avail.append(pkgs.a_wbar_0_2_i)
+ pkgs.avail.append(pkgs.a_wbar_2_22_i)
+
+ def testBestInstall1(self):
+ p = self.pkgs
+ ninst = p.inst[:]
+ ninst.append(p.a_bar_2_22_x)
+ res, msg = self.runOperation(['install', 'bar'], p.inst, p.avail)
+ self.assertResult(ninst)
+
+ def testBestInstall2(self):
+ p = self.pkgs
+ ninst = p.inst[:]
+ ninst.append(p.a_bar_1_12_x)
+ res, msg = self.runOperation(['install', 'bar-1'], p.inst, p.avail)
+ self.assertResult(ninst)
+
+ def testAllInstall1(self):
+ p = self.pkgs
+ ninst = p.inst[:]
+ ninst.append(p.a_bar_2_22_x)
+ ninst.append(p.a_bar_2_22_i)
+ res, msg = self.runOperation(['install', 'bar'], p.inst, p.avail,
+ {'multilib_policy' : 'all'})
+ self.assertResult(ninst)
+
+ def testAllInstall2(self):
+ p = self.pkgs
+ ninst = p.inst[:]
+ ninst.append(p.a_bar_1_12_x)
+ ninst.append(p.a_bar_1_12_i)
+ res, msg = self.runOperation(['install', 'bar-1'], p.inst, p.avail,
+ {'multilib_policy' : 'all'})
+ self.assertResult(ninst)
+
+ def testAllInstall3(self):
+ p = self.pkgs
+ ninst = p.inst[:]
+ ninst.append(p.a_ibar_2_22_x)
+ res, msg = self.runOperation(['install', 'ibar'], p.inst, p.avail,
+ {'multilib_policy' : 'all'})
+ self.assertResult(ninst)
+
+ def testAllInstall4(self):
+ p = self.pkgs
+ ninst = p.inst[:]
+ ninst.append(p.a_xbar_2_22_i)
+ res, msg = self.runOperation(['install', 'xbar'], p.inst, p.avail,
+ {'multilib_policy' : 'all'})
+ self.assertResult(ninst)
+
+ def testDowngrade1(self):
+ p = self.pkgs
+ ninst = [p.i_foo_1_12_x, p.a_wbar_0_2_i]
+ res, msg = self.runOperation(['downgrade', 'wbar'], p.inst, p.avail)
+ self.assertResult(ninst)
+
+ def testDowngrade2(self):
+ p = self.pkgs
+ oinst = [p.i_foo_1_12_x, p.a_wbar_2_22_i]
+ ninst = [p.i_foo_1_12_x, p.i_wbar_1_12_i]
+ p.avail.append(p.i_wbar_1_12_i)
+ res, msg = self.runOperation(['downgrade', 'wbar'], oinst, p.avail)
+ self.assertResult(ninst)
+
+ def testDowngrade3(self):
+ p = self.pkgs
+ oinst = [p.i_foo_1_12_x, p.a_wbar_2_22_i]
+ ninst = [p.i_foo_1_12_x, p.a_wbar_0_2_i]
+ res, msg = self.runOperation(['downgrade', 'wbar'], oinst, p.avail)
+ self.assertResult(ninst)
+
+ def testDowngrade4(self):
+ p = self.pkgs
+ oinst = p.inst[:] + [p.a_ibar_2_22_x]
+ p.a_ibar_1_12_i.arch = 'noarch'
+ ninst = p.inst[:] + [p.a_ibar_1_12_i]
+ res, msg = self.runOperation(['downgrade', 'ibar'], oinst, p.avail)
+ self.assertResult(ninst)
+
+ def testDowngrade5(self):
+ p = self.pkgs
+ ninst = p.inst[:] + [p.a_xbar_1_12_x]
+ p.a_xbar_2_22_i.arch = 'noarch'
+ oinst = p.inst[:] + [p.a_xbar_2_22_i]
+ res, msg = self.runOperation(['downgrade', 'xbar'], oinst, p.avail)
+ self.assertResult(ninst)
diff --git a/test/rpmdb-cache.py b/test/rpmdb-cache.py
new file mode 100755
index 0000000..7768a93
--- /dev/null
+++ b/test/rpmdb-cache.py
@@ -0,0 +1,87 @@
+#! /usr/bin/python -tt
+
+import sys
+import yum
+
+__provides_of_requires_exact__ = False
+
+yb1 = yum.YumBase()
+yb1.conf.cache = True
+yb2 = yum.YumBase()
+yb2.conf.cache = True
+
+if len(sys.argv) > 1 and sys.argv[1].lower() == 'full':
+ print "Doing full test"
+ __provides_of_requires_exact__ = True
+
+assert hasattr(yb1.rpmdb, '__cache_rpmdb__')
+yb1.rpmdb.__cache_rpmdb__ = False
+yb2.setCacheDir()
+
+# Version
+ver1 = yb1.rpmdb.simpleVersion(main_only=True)[0]
+ver2 = yb2.rpmdb.simpleVersion(main_only=True)[0]
+if ver1 != ver2:
+ print >>sys.stderr, "Error: Version mismatch:", ver1, ver2
+
+# Conflicts
+cpkgs1 = yb1.rpmdb.returnConflictPackages()
+cpkgs2 = yb2.rpmdb.returnConflictPackages()
+if len(cpkgs1) != len(cpkgs2):
+ print >>sys.stderr, "Error: Conflict len mismatch:", len(cpkgs1),len(cpkgs2)
+for pkg in cpkgs1:
+ if pkg not in cpkgs2:
+ print >>sys.stderr, "Error: Conflict cache missing", pkg
+for pkg in cpkgs2:
+ if pkg not in cpkgs1:
+ print >>sys.stderr, "Error: Conflict cache extra", pkg
+
+# File Requires
+frd1, blah, fpd1 = yb1.rpmdb.fileRequiresData()
+frd2, blah, fpd2 = yb2.rpmdb.fileRequiresData()
+if len(frd1) != len(frd2):
+ print >>sys.stderr, "Error: FileReq len mismatch:", len(frd1), len(frd2)
+for pkgtup in frd1:
+ if pkgtup not in frd2:
+ print >>sys.stderr, "Error: FileReq cache missing", pkgtup
+ continue
+ if len(set(frd1[pkgtup])) != len(set(frd2[pkgtup])):
+ print >>sys.stderr, ("Error: FileReq[%s] len mismatch:" % (pkgtup,),
+ len(frd1[pkgtup]), len(frd2[pkgtup]))
+ for name in frd1[pkgtup]:
+ if name not in frd2[pkgtup]:
+ print >>sys.stderr, ("Error: FileReq[%s] cache missing" % (pkgtup,),
+ name)
+for pkgtup in frd2:
+ if pkgtup not in frd1:
+ print >>sys.stderr, "Error: FileReq cache extra", pkgtup
+ continue
+ for name in frd2[pkgtup]:
+ if name not in frd1[pkgtup]:
+ print >>sys.stderr, ("Error: FileReq[%s] cache extra" % (pkgtup,),
+ name)
+
+# File Provides (of requires) -- not exact
+if len(fpd1) != len(fpd2):
+ print >>sys.stderr, "Error: FileProv len mismatch:", len(fpd1), len(fpd2)
+for name in fpd1:
+ if name not in fpd2:
+ print >>sys.stderr, "Error: FileProv cache missing", name
+ continue
+
+ if not __provides_of_requires_exact__:
+ continue # We might be missing some providers
+
+ if len(fpd1[name]) != len(fpd2[name]):
+ print >>sys.stderr, ("Error: FileProv[%s] len mismatch:" % (pkgtup,),
+ len(fpd1[name]), len(fpd2[name]))
+ for pkgtup in fpd1[name]:
+ if pkgtup not in fpd2[name]:
+ print >>sys.stderr,"Error: FileProv[%s] cache missing" % name,pkgtup
+for name in fpd2:
+ if name not in fpd1:
+ print >>sys.stderr, "Error: FileProv cache extra", name
+ continue
+ for pkgtup in fpd2[name]:
+ if pkgtup not in fpd1[name]:
+ print >>sys.stderr,"Error: FileProv[%s] cache extra" % name,pkgtup
diff --git a/test/skipbroken-tests.py b/test/skipbroken-tests.py
index f8896f1..52907dd 100644
--- a/test/skipbroken-tests.py
+++ b/test/skipbroken-tests.py
@@ -599,6 +599,29 @@ class SkipBrokenTests(DepsolveTests):
self.assertEquals('empty', *self.resolveCode(skip=True))
self.assertResult([i1,i2])
+
+ def testMissingfileReqIptabes(self):
+ '''
+ RHBZ #555528
+ iptables-0:1.4.5-1.fc12.i686 provides /usr/lib/libxtables.so.2
+ is updated to
+ iptables-0:1.4.6-1.fc13.i686 provides /usr/lib/libxtables.so.4
+ so libguestfs-1:1.0.81-1.fc13.i686 that requires /usr/lib/libxtables.so.2
+ breaks because /usr/lib/libxtables.so.2 no longer exists.
+
+ It fails in real life but not in the testcase :(
+
+ '''
+ i1 = self.instPackage('iptables','1.4.5', arch='x86_64')
+ i1.addFile("/usr/lib64/libxtables.so.2")
+ i2 = self.instPackage('libguestfs','1.0.81', arch='x86_64')
+ i2.addRequires("/usr/lib64/libxtables.so.2")
+ u1 = self.repoPackage('iptables','1.4.6', arch='x86_64')
+ u1.addFile("/usr/lib64/libxtables.so.4")
+ self.tsInfo.addUpdate(u1, oldpo=i1)
+ self.assertEquals('empty', *self.resolveCode(skip=True))
+ self.assertResult([i1,i2])
+
def resolveCode(self,skip = False):
diff --git a/test/testbase.py b/test/testbase.py
index 3edfe57..0b05812 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -14,6 +14,7 @@ from yum import packages
from yum import packageSack
from yum.constants import TS_INSTALL_STATES, TS_REMOVE_STATES
from cli import YumBaseCli
+from yum.rpmsack import RPMDBPackageSack as _rpmdbsack
import inspect
from rpmUtils import arch
@@ -233,6 +234,52 @@ class FakeRpmDb(packageSack.PackageSack):
def __init__(self):
packageSack.PackageSack.__init__(self)
+ # Need to mock out rpmdb caching... copy&paste. Gack.
+ def returnConflictPackages(self):
+ ret = []
+ for pkg in self.returnPackages():
+ if len(pkg.conflicts):
+ ret.append(pkg)
+ return ret
+ def fileRequiresData(self):
+ installedFileRequires = {}
+ installedUnresolvedFileRequires = set()
+ resolved = set()
+ for pkg in self.returnPackages():
+ for name, flag, evr in pkg.requires:
+ if not name.startswith('/'):
+ continue
+ installedFileRequires.setdefault(pkg.pkgtup, []).append(name)
+ if name not in resolved:
+ dep = self.getProvides(name, flag, evr)
+ resolved.add(name)
+ if not dep:
+ installedUnresolvedFileRequires.add(name)
+
+ fileRequires = set()
+ for fnames in installedFileRequires.itervalues():
+ fileRequires.update(fnames)
+ installedFileProviders = {}
+ for fname in fileRequires:
+ pkgtups = [pkg.pkgtup for pkg in self.getProvides(fname)]
+ installedFileProviders[fname] = pkgtups
+
+ ret = (installedFileRequires, installedUnresolvedFileRequires,
+ installedFileProviders)
+
+ return ret
+ def transactionCacheFileRequires(self, installedFileRequires,
+ installedUnresolvedFileRequires,
+ installedFileProvides,
+ problems):
+ return
+ def transactionCacheConflictPackages(self, pkgs):
+ return
+ def transactionResultVersion(self, rpmdbv):
+ return
+ def transactionReset(self):
+ return
+
def getProvides(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
self._checkIndexes(failure='build')
@@ -332,7 +379,8 @@ class OperationsTests(_DepsolveTestsBase):
buildPkg code.
"""
- def runOperation(self, args, installed=[], available=[]):
+ def runOperation(self, args, installed=[], available=[],
+ confs={}):
"""Sets up and runs the depsolver. args[0] must be a valid yum command
("install", "update", ...). It might be followed by pkg names as on the
yum command line. The pkg objects in installed are added to self.rpmdb and
@@ -345,6 +393,8 @@ class OperationsTests(_DepsolveTestsBase):
self.xsack = depsolver._pkgSack = packageSack.PackageSack()
self.repo = depsolver.repo = FakeRepo("installed")
depsolver.conf = FakeConf()
+ for conf in confs:
+ setattr(depsolver.conf, conf, confs[conf])
# We are running nosetest, so we want to see some yum output
# if a testcase if failing
depsolver.doLoggingSetup(9,9)
diff --git a/utils.py b/utils.py
index a053720..2b0f655 100644
--- a/utils.py
+++ b/utils.py
@@ -25,7 +25,7 @@ from yum import logginglevels
from optparse import OptionGroup
import yum.plugins as plugins
-
+from urlgrabber.progress import format_number
def suppress_keyboard_interrupt_message():
old_excepthook = sys.excepthook
@@ -38,6 +38,88 @@ def suppress_keyboard_interrupt_message():
sys.excepthook = new_hook
+def jiffies_to_seconds(jiffies):
+ Hertz = 100 # FIXME: Hack, need to get this, AT_CLKTCK elf note *sigh*
+ return int(jiffies) / Hertz
+
+def seconds_to_ui_time(seconds):
+ if seconds >= 60 * 60 * 24:
+ return "%d day(s) %d:%02d:%02d" % (seconds / (60 * 60 * 24),
+ (seconds / (60 * 60)) % 24,
+ (seconds / 60) % 60,
+ seconds % 60)
+ if seconds >= 60 * 60:
+ return "%d:%02d:%02d" % (seconds / (60 * 60), (seconds / 60) % 60,
+ (seconds % 60))
+ return "%02d:%02d" % ((seconds / 60), seconds % 60)
+
+def get_process_info(pid):
+ if not pid:
+ return
+
+ # Maybe true if /proc isn't mounted, or not Linux ... or something.
+ if (not os.path.exists("/proc/%d/status" % pid) or
+ not os.path.exists("/proc/stat") or
+ not os.path.exists("/proc/%d/stat" % pid)):
+ return
+
+ ps = {}
+ for line in open("/proc/%d/status" % pid):
+ if line[-1] != '\n':
+ continue
+ data = line[:-1].split(':\t', 1)
+ if len(data) < 2:
+ continue
+ if data[1].endswith(' kB'):
+ data[1] = data[1][:-3]
+ ps[data[0].strip().lower()] = data[1].strip()
+ if 'vmrss' not in ps:
+ return
+ if 'vmsize' not in ps:
+ return
+ boot_time = None
+ for line in open("/proc/stat"):
+ if line.startswith("btime "):
+ boot_time = int(line[len("btime "):-1])
+ break
+ if boot_time is None:
+ return
+ ps_stat = open("/proc/%d/stat" % pid).read().split()
+ ps['utime'] = jiffies_to_seconds(ps_stat[13])
+ ps['stime'] = jiffies_to_seconds(ps_stat[14])
+ ps['cutime'] = jiffies_to_seconds(ps_stat[15])
+ ps['cstime'] = jiffies_to_seconds(ps_stat[16])
+ ps['start_time'] = boot_time + jiffies_to_seconds(ps_stat[21])
+ ps['state'] = {'R' : _('Running'),
+ 'S' : _('Sleeping'),
+ 'D' : _('Uninteruptable'),
+ 'Z' : _('Zombie'),
+ 'T' : _('Traced/Stopped')
+ }.get(ps_stat[2], _('Unknown'))
+
+ return ps
+
+def show_lock_owner(pid, logger):
+ if not pid:
+ return
+
+ ps = get_process_info(pid)
+ # This yumBackend isn't very friendly, so...
+ if ps['name'] == 'yumBackend.py':
+ nmsg = _(" The other application is: PackageKit")
+ else:
+ nmsg = _(" The other application is: %s") % ps['name']
+
+ logger.critical("%s", nmsg)
+ logger.critical(_(" Memory : %5s RSS (%5sB VSZ)") %
+ (format_number(int(ps['vmrss']) * 1024),
+ format_number(int(ps['vmsize']) * 1024)))
+
+ ago = seconds_to_ui_time(int(time.time()) - ps['start_time'])
+ logger.critical(_(" Started: %s - %s ago") %
+ (time.ctime(ps['start_time']), ago))
+ logger.critical(_(" State : %s, pid: %d") % (ps['state'], pid))
+
class YumUtilBase(YumBaseCli):
def __init__(self,name,ver,usage):
YumBaseCli.__init__(self)
@@ -48,6 +130,9 @@ class YumUtilBase(YumBaseCli):
self._option_group = OptionGroup(self._parser, "%s options" % self._utilName,"")
self._parser.add_option_group(self._option_group)
suppress_keyboard_interrupt_message()
+ logger = logging.getLogger("yum.util")
+ verbose_logger = logging.getLogger("yum.verbose.util")
+
def getOptionParser(self):
return self._parser
@@ -66,6 +151,7 @@ class YumUtilBase(YumBaseCli):
lockerr = "%s" %(e.msg,)
self.logger.critical(lockerr)
self.logger.critical("Another app is currently holding the yum lock; waiting for it to exit...")
+ show_lock_owner(e.pid, self.logger)
time.sleep(2)
else:
break
@@ -109,14 +195,25 @@ class YumUtilBase(YumBaseCli):
except ValueError, e:
self.logger.critical(_('Options Error: %s'), e)
sys.exit(1)
-
-
+ except plugins.PluginYumExit, e:
+ self.logger.critical(_('PluginExit Error: %s'), e)
+ sys.exit(1)
+ except Errors.YumBaseError, e:
+ self.logger.critical(_('Yum Error: %s'), e)
+ sys.exit(1)
+
# update usage in case plugins have added commands
self._parser.set_usage(self._usage)
# Now parse the command line for real and
# apply some of the options to self.conf
(opts, self.cmds) = self._parser.setupYumConfig()
+ if self.cmds:
+ self.basecmd = self.cmds[0] # our base command
+ else:
+ self.basecmd = None
+ self.extcmds = self.cmds[1:] # out extended arguments/commands
+
return opts
def doUtilYumSetup(self):
@@ -124,6 +221,7 @@ class YumUtilBase(YumBaseCli):
really just a shorthand for testing"""
# FIXME - we need another way to do this, I think.
try:
+ self.waitForLock()
self._getTs()
self._getRpmDB()
self._getRepos(doSetup = True)
diff --git a/yum.spec b/yum.spec
index a72509c..44018ba 100644
--- a/yum.spec
+++ b/yum.spec
@@ -21,6 +21,7 @@ Requires: python-iniparse
Requires: pygpgme
Prereq: /sbin/chkconfig, /sbin/service, coreutils
Conflicts: yum-skip-broken
+Conflicts: rpm >= 5-0
Obsoletes: yum-basearchonly
Obsoletes: yum-allow-downgrade < 1.1.20-0
Obsoletes: yum-plugin-allow-downgrade < 1.1.22-0
@@ -82,6 +83,7 @@ exit 0
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/yum/repos.d
%config %{_sysconfdir}/logrotate.d/%{name}
+%{_sysconfdir}/bash_completion.d
%{_datadir}/yum-cli/*
%exclude %{_datadir}/yum-cli/yumupd.py*
%{_bindir}/yum
diff --git a/yum/Errors.py b/yum/Errors.py
index 3a5aca9..a3a12c5 100644
--- a/yum/Errors.py
+++ b/yum/Errors.py
@@ -110,6 +110,9 @@ class CompsException(YumBaseError):
class MediaError(YumBaseError):
pass
+class PkgTagsError(YumBaseError):
+ pass
+
class YumDeprecationWarning(DeprecationWarning):
"""
Used to mark a method as deprecated.
diff --git a/yum/__init__.py b/yum/__init__.py
index 655f8e1..cb06d1b 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -44,6 +44,7 @@ import rpmUtils.updates
from rpmUtils.arch import canCoinstall, ArchStorage, isMultiLibArch
import rpmUtils.transaction
import comps
+import pkgtag_db
from repos import RepoStorage
import misc
from parser import ConfigPreProcessor, varReplace
@@ -51,7 +52,7 @@ import transactioninfo
import urlgrabber
from urlgrabber.grabber import URLGrabber, URLGrabError
from urlgrabber.progress import format_number
-from packageSack import packagesNewestByNameArch, ListPackageSack
+from packageSack import packagesNewestByName, packagesNewestByNameArch, ListPackageSack
import depsolve
import plugins
import logginglevels
@@ -62,7 +63,9 @@ import yum.history
import warnings
warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
-from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage, comparePoEVR
+from packages import parsePackages, comparePoEVR
+from packages import YumAvailablePackage, YumLocalPackage, YumInstalledPackage
+from packages import YumUrlPackage
from constants import *
from yum.rpmtrans import RPMTransaction,SimpleCliCallBack
from yum.i18n import to_unicode, to_str
@@ -102,6 +105,7 @@ class _YumPreBaseConf:
self.syslog_device = '/dev/log'
self.arch = None
self.releasever = None
+ self.uuid = None
class _YumCostExclude:
""" This excludes packages that are in repos. of lower cost than the passed
@@ -141,6 +145,7 @@ class YumBase(depsolve.Depsolve):
self._history = None
self._pkgSack = None
self._lockfile = None
+ self._tags = None
self.skipped_packages = [] # packages skip by the skip-broken code
self.logger = logging.getLogger("yum.YumBase")
self.verbose_logger = logging.getLogger("yum.verbose.YumBase")
@@ -234,7 +239,8 @@ class YumBase(depsolve.Depsolve):
syslog_device = self.preconf.syslog_device
releasever = self.preconf.releasever
arch = self.preconf.arch
-
+ uuid = self.preconf.uuid
+
if arch: # if preconf is setting an arch we need to pass that up
self.arch.setup_arch(arch)
else:
@@ -249,7 +255,9 @@ class YumBase(depsolve.Depsolve):
startupconf = config.readStartupConfig(fn, root)
startupconf.arch = arch
startupconf.basearch = self.arch.basearch
-
+ if uuid:
+ startupconf.uuid = uuid
+
if startupconf.gaftonmode:
global _
_ = yum.i18n.dummy_wrapper
@@ -285,6 +293,10 @@ class YumBase(depsolve.Depsolve):
# run the postconfig plugin hook
self.plugins.run('postconfig')
+ # Note that Pungi has historically replaced _getConfig(), and it sets
+ # up self.conf.yumvar but not self.yumvar ... and AFAIK nothing needs
+ # to use YumBase.yumvar, so it's probably easier to just semi-deprecate
+ # this (core now only uses YumBase.conf.yumvar).
self.yumvar = self.conf.yumvar
self.getReposFromConfig()
@@ -321,7 +333,7 @@ class YumBase(depsolve.Depsolve):
if repo_age is None:
repo_age = os.stat(repofn)[8]
- confpp_obj = ConfigPreProcessor(repofn, vars=self.yumvar)
+ confpp_obj = ConfigPreProcessor(repofn, vars=self.conf.yumvar)
parser = ConfigParser()
try:
parser.readfp(confpp_obj)
@@ -466,7 +478,10 @@ class YumBase(depsolve.Depsolve):
rpmdb_st = time.time()
self.verbose_logger.log(logginglevels.DEBUG_4,
_('Reading Local RPMDB'))
- self._rpmdb = rpmsack.RPMDBPackageSack(root=self.conf.installroot)
+ self._rpmdb = rpmsack.RPMDBPackageSack(root=self.conf.installroot,
+ releasever=self.conf.yumvar['releasever'],
+ persistdir=self.conf.persistdir,
+ cachedir=self.conf.cachedir)
self.verbose_logger.debug('rpmdb time: %0.3f' % (time.time() - rpmdb_st))
return self._rpmdb
@@ -706,39 +721,88 @@ class YumBase(depsolve.Depsolve):
self.verbose_logger.debug('group time: %0.3f' % (time.time() - group_st))
return self._comps
+ def _getTags(self):
+ """ create the tags object used to search/report from the pkgtags
+ metadata"""
+
+ tag_st = time.time()
+ self.verbose_logger.log(logginglevels.DEBUG_4,
+ _('Getting pkgtags metadata'))
+
+ if self._tags is None:
+ self._tags = yum.pkgtag_db.PackageTags()
+
+ for repo in self.repos.listEnabled():
+ if 'pkgtags' not in repo.repoXML.fileTypes():
+ continue
+
+ self.verbose_logger.log(logginglevels.DEBUG_4,
+ _('Adding tags from repository: %s'), repo)
+
+ # fetch the sqlite tagdb
+ try:
+ tag_md = repo.retrieveMD('pkgtags')
+ tag_sqlite = yum.misc.decompress(tag_md)
+ # feed it into _tags.add()
+ self._tags.add(repo.id, tag_sqlite)
+ except (Errors.RepoError, Errors.PkgTagsError), e:
+ msg = _('Failed to add Pkg Tags for repository: %s - %s') % (repo, str(e))
+ self.logger.critical(msg)
+
+
+ self.verbose_logger.debug('tags time: %0.3f' % (time.time() - tag_st))
+ return self._tags
+
def _getHistory(self):
"""auto create the history object that to access/append the transaction
history information. """
if self._history is None:
- self._history = yum.history.YumHistory(root=self.conf.installroot)
+ pdb_path = self.conf.persistdir + "/history"
+ self._history = yum.history.YumHistory(root=self.conf.installroot,
+ db_path=pdb_path)
return self._history
# properties so they auto-create themselves with defaults
repos = property(fget=lambda self: self._getRepos(),
fset=lambda self, value: setattr(self, "_repos", value),
- fdel=lambda self: self._delRepos())
+ fdel=lambda self: self._delRepos(),
+ doc="Repo Storage object - object of yum repositories")
pkgSack = property(fget=lambda self: self._getSacks(),
fset=lambda self, value: setattr(self, "_pkgSack", value),
- fdel=lambda self: self._delSacks())
+ fdel=lambda self: self._delSacks(),
+ doc="Package sack object - object of yum package objects")
conf = property(fget=lambda self: self._getConfig(),
fset=lambda self, value: setattr(self, "_conf", value),
- fdel=lambda self: setattr(self, "_conf", None))
+ fdel=lambda self: setattr(self, "_conf", None),
+ doc="Yum Config Object")
rpmdb = property(fget=lambda self: self._getRpmDB(),
fset=lambda self, value: setattr(self, "_rpmdb", value),
- fdel=lambda self: setattr(self, "_rpmdb", None))
+ fdel=lambda self: setattr(self, "_rpmdb", None),
+ doc="RpmSack object")
tsInfo = property(fget=lambda self: self._getTsInfo(),
fset=lambda self,value: self._setTsInfo(value),
- fdel=lambda self: self._delTsInfo())
- ts = property(fget=lambda self: self._getActionTs(), fdel=lambda self: self._deleteTs())
+ fdel=lambda self: self._delTsInfo(),
+ doc="Transaction Set information object")
+ ts = property(fget=lambda self: self._getActionTs(),
+ fdel=lambda self: self._deleteTs(),
+ doc="TransactionSet object")
up = property(fget=lambda self: self._getUpdates(),
fset=lambda self, value: setattr(self, "_up", value),
- fdel=lambda self: setattr(self, "_up", None))
+ fdel=lambda self: setattr(self, "_up", None),
+ doc="Updates Object")
comps = property(fget=lambda self: self._getGroups(),
fset=lambda self, value: self._setGroups(value),
- fdel=lambda self: setattr(self, "_comps", None))
+ fdel=lambda self: setattr(self, "_comps", None),
+ doc="Yum Component/groups object")
history = property(fget=lambda self: self._getHistory(),
fset=lambda self, value: setattr(self, "_history",value),
- fdel=lambda self: setattr(self, "_history", None))
+ fdel=lambda self: setattr(self, "_history", None),
+ doc="Yum History Object")
+
+ pkgtags = property(fget=lambda self: self._getTags(),
+ fset=lambda self, value: setattr(self, "_tags",value),
+ fdel=lambda self: setattr(self, "_tags", None),
+ doc="Yum Package Tags Object")
def doSackFilelistPopulate(self):
@@ -850,6 +914,11 @@ class YumBase(depsolve.Depsolve):
looping = 0
while (len(self.po_with_problems) > 0 and rescode == 1):
count += 1
+ # Remove all the rpmdb cache data, this is somewhat heavy handed
+ # but easier than removing/altering specific bits of the cache ...
+ # and skip-broken shouldn't care too much about speed.
+ self.rpmdb.transactionReset()
+ self.installedFileRequires = None # Kind of hacky
self.verbose_logger.debug(_("Skip-broken round %i"), count)
self._printTransaction()
depTree = self._buildDepTree()
@@ -1018,10 +1087,10 @@ class YumBase(depsolve.Depsolve):
TS_UPDATED : "updated"}
self.verbose_logger.log(logginglevels.DEBUG_2,"TSINFO: Current Transaction : %i member(s) " % len(self.tsInfo))
- for txmbr in self.tsInfo:
+ for txmbr in sorted(self.tsInfo):
msg = " %-11s : %s " % (state[txmbr.output_state],txmbr.po)
self.verbose_logger.log(logginglevels.DEBUG_2, msg)
- for po,rel in txmbr.relatedto:
+ for po,rel in sorted(txmbr.relatedto):
msg = " %s : %s" % (rel,po)
self.verbose_logger.log(logginglevels.DEBUG_2, msg)
@@ -1045,6 +1114,28 @@ class YumBase(depsolve.Depsolve):
toRemove.add(dep)
self._getDepsToRemove(dep, deptree, toRemove)
+ def _rpmdb_warn_checks(self, out=None, warn=True, chkcmd='all'):
+ if out is None:
+ out = self.logger.warning
+ if warn:
+ out(_('Warning: RPMDB altered outside of yum.'))
+
+ rc = 0
+ probs = []
+ if chkcmd in ('all', 'dependencies'):
+ prob2ui = {'requires' : _('missing requires'),
+ 'conflicts' : _('installed conflict')}
+ probs.extend(self.rpmdb.check_dependencies())
+
+ if chkcmd in ('all', 'duplicates'):
+ iopkgs = set(self.conf.installonlypkgs)
+ probs.extend(self.rpmdb.check_duplicates(iopkgs))
+
+ for prob in sorted(probs):
+ out(prob)
+
+ return len(probs)
+
def runTransaction(self, cb):
"""takes an rpm callback object, performs the transaction"""
@@ -1063,12 +1154,18 @@ class YumBase(depsolve.Depsolve):
lastdbv = self.history.last()
if lastdbv is not None:
lastdbv = lastdbv.end_rpmdbversion
- if lastdbv is not None and rpmdbv != lastdbv:
- errstring = _('Warning: RPMDB has been altered since the last yum transaction.')
- self.logger.warning(errstring)
+ if lastdbv is None or rpmdbv != lastdbv:
+ self._rpmdb_warn_checks(warn=lastdbv is not None)
if self.conf.history_record:
self.history.beg(rpmdbv, using_pkgs, list(self.tsInfo))
+ # Just before we update the transaction, update what we think the
+ # rpmdb will look like. This needs to be done before the run, so that if
+ # "something" happens and the rpmdb is different from what we think it
+ # will be we store what we thought, not what happened (so it'll be an
+ # invalid cache).
+ self.rpmdb.transactionResultVersion(self.tsInfo.futureRpmDBVersion())
+
errors = self.ts.run(cb.callback, '')
# ts.run() exit codes are, hmm, "creative": None means all ok, empty
# list means some errors happened in the transaction and non-empty
@@ -1134,7 +1231,7 @@ class YumBase(depsolve.Depsolve):
rpo = txmbr.po
po.yumdb_info.from_repo = rpo.repoid
po.yumdb_info.reason = txmbr.reason
- po.yumdb_info.releasever = self.yumvar['releasever']
+ po.yumdb_info.releasever = self.conf.yumvar['releasever']
if hasattr(self, 'cmds') and self.cmds:
po.yumdb_info.command_line = ' '.join(self.cmds)
csum = rpo.returnIdSum()
@@ -1501,7 +1598,7 @@ class YumBase(depsolve.Depsolve):
adderror(po, str(e))
else:
po.localpath = mylocal
- if errors.has_key(po):
+ if po in errors:
del errors[po]
if hasattr(urlgrabber.progress, 'text_meter_total_size'):
@@ -1646,7 +1743,7 @@ class YumBase(depsolve.Depsolve):
continue
if txmbr.po.repoid == "installed":
continue
- if not self.repos.repos.has_key(txmbr.po.repoid):
+ if txmbr.po.repoid not in self.repos.repos:
continue
# make sure it's not a local file
@@ -1696,15 +1793,25 @@ class YumBase(depsolve.Depsolve):
exts = ['cachecookie', 'mirrorlist.txt']
return self._cleanFiles(exts, 'cachedir', 'metadata')
+ def cleanRpmDB(self):
+ cachedir = self.conf.cachedir + "/installed/"
+ if not os.path.exists(cachedir):
+ filelist = []
+ else:
+ filelist = misc.getFileList(cachedir, '', [])
+ return self._cleanFilelist('rpmdb', filelist)
+
def _cleanFiles(self, exts, pathattr, filetype):
filelist = []
- removed = 0
for ext in exts:
for repo in self.repos.listEnabled():
path = getattr(repo, pathattr)
if os.path.exists(path) and os.path.isdir(path):
filelist = misc.getFileList(path, ext, filelist)
+ return self._cleanFilelist(filetype, filelist)
+ def _cleanFilelist(self, filetype, filelist):
+ removed = 0
for item in filelist:
try:
misc.unlink_f(item)
@@ -1865,6 +1972,15 @@ class YumBase(depsolve.Depsolve):
continue
nobsoletesTuples.append((po, instpo))
obsoletesTuples = nobsoletesTuples
+ if not showdups:
+ obsoletes = packagesNewestByName(obsoletes)
+ filt = set(obsoletes)
+ nobsoletesTuples = []
+ for po, instpo in obsoletesTuples:
+ if po not in filt:
+ continue
+ nobsoletesTuples.append((po, instpo))
+ obsoletesTuples = nobsoletesTuples
# packages recently added to the repositories
elif pkgnarrow == 'recent':
@@ -1953,19 +2069,23 @@ class YumBase(depsolve.Depsolve):
else:
sql_fields.append(f)
- matched_values = {}
-
# yield the results in order of most terms matched first
- sorted_lists = {}
+ sorted_lists = {} # count_of_matches = [(pkgobj,
+ # [search strings which matched],
+ # [results that matched])]
tmpres = []
real_crit = []
- for s in criteria:
- real_crit.append(s)
real_crit_lower = [] # Take the s.lower()'s out of the loop
rcl2c = {}
+ # weigh terms in given order (earlier = more relevant)
+ critweight = 0
+ critweights = {}
for s in criteria:
+ real_crit.append(s)
real_crit_lower.append(s.lower())
rcl2c[s.lower()] = s
+ critweights.setdefault(s, critweight)
+ critweight -= 1
for sack in self.pkgSack.sacks.values():
tmpres.extend(sack.searchPrimaryFieldsMultipleStrings(sql_fields, real_crit))
@@ -1997,11 +2117,29 @@ class YumBase(depsolve.Depsolve):
results2sorted_lists(tmpres, sorted_lists)
del tmpres
+ tmpres = self.searchPackageTags(real_crit_lower)
+ for pkg in tmpres:
+ count = 0
+ matchkeys = []
+ tagresults = []
+ for (match, taglist) in tmpres[pkg]:
+ count += len(taglist)
+ matchkeys.append(rcl2c[match])
+ tagresults.extend(taglist)
+
+
+ if count not in sorted_lists: sorted_lists[count] = []
+ sorted_lists[count].append((pkg, matchkeys, tagresults))
+
+ del tmpres
+
# By default just sort using package sorting
sort_func = operator.itemgetter(0)
if keys:
- # Take into account the keys found, as well
- sort_func = lambda x: "%s%s" % ("\0".join(sorted(x[1])), str(x[0]))
+ # Take into account the keys found, their original order,
+ # and number of fields hit as well
+ sort_func = lambda x: (-sum((critweights[y] for y in x[1])),
+ "\0".join(sorted(x[1])), -len(x[2]), x[0])
yielded = {}
for val in reversed(sorted(sorted_lists)):
for (po, ks, vs) in sorted(sorted_lists[val], key=sort_func):
@@ -2016,7 +2154,22 @@ class YumBase(depsolve.Depsolve):
if not showdups:
yielded[(po.name, po.arch)] = 1
-
+ def searchPackageTags(self, criteria):
+ results = {} # name = [(criteria, taglist)]
+ for c in criteria:
+ c = c.lower()
+ res = self.pkgtags.search_tags(c)
+ for (name, taglist) in res.items():
+ pkgs = self.pkgSack.searchNevra(name=name)
+ if not pkgs:
+ continue
+ pkg = pkgs[0]
+ if pkg not in results:
+ results[pkg] = []
+ results[pkg].append((c, taglist))
+
+ return results
+
def searchPackages(self, fields, criteria, callback=None):
"""Search specified fields for matches to criteria
optional callback specified to print out results
@@ -2322,15 +2475,18 @@ class YumBase(depsolve.Depsolve):
use.append(pkg)
pkgs = use
- pkgs = packagesNewestByNameArch(pkgs)
+ pkgs = packagesNewestByName(pkgs)
if not self.tsInfo.conditionals.has_key(cond):
self.tsInfo.conditionals[cond] = []
self.tsInfo.conditionals[cond].extend(pkgs)
return txmbrs_used
- def deselectGroup(self, grpid):
- """de-mark all the packages in the group for install"""
+ def deselectGroup(self, grpid, force=False):
+ """ Without the force option set, this removes packages from being
+ installed that were added as part of installing one of the
+ group(s). If the force option is set, then all installing packages
+ in the group(s) are force removed from the transaction. """
if not self.comps.has_group(grpid):
raise Errors.GroupsError, _("No Group named %s exists") % grpid
@@ -2343,9 +2499,12 @@ class YumBase(depsolve.Depsolve):
thisgroup.selected = False
for pkgname in thisgroup.packages:
-
- for txmbr in self.tsInfo:
- if txmbr.po.name == pkgname and txmbr.po.state in TS_INSTALL_STATES:
+ txmbrs = self.tsInfo.getMembersWithState(None,TS_INSTALL_STATES)
+ for txmbr in txmbrs:
+ if txmbr.po.name != pkgname:
+ continue
+
+ if not force:
try:
txmbr.groups.remove(grpid)
except ValueError:
@@ -2354,13 +2513,12 @@ class YumBase(depsolve.Depsolve):
grpid)
continue
- # if there aren't any other groups mentioned then remove the pkg
- if len(txmbr.groups) == 0:
- self.tsInfo.remove(txmbr.po.pkgtup)
-
- for pkg in self.tsInfo.conditionals.get(txmbr.name, []):
- self.tsInfo.remove(pkg.pkgtup)
-
+ # If the pkg isn't part of any group, or the group is
+ # being forced out ... then remove the pkg
+ if force or len(txmbr.groups) == 0:
+ self.tsInfo.remove(txmbr.po.pkgtup)
+ for pkg in self.tsInfo.conditionals.get(txmbr.name, []):
+ self.tsInfo.remove(pkg.pkgtup)
def getPackageObject(self, pkgtup):
"""retrieves a packageObject from a pkgtuple - if we need
@@ -2467,7 +2625,7 @@ class YumBase(depsolve.Depsolve):
# we get all sorts of randomness here
errstring = depstring
if type(depstring) not in types.StringTypes:
- errtring = str(depstring)
+ errstring = str(depstring)
try:
pkglist = self.returnPackagesByDep(depstring)
@@ -2592,7 +2750,7 @@ class YumBase(depsolve.Depsolve):
""" Given a package return the package it's obsoleted by and so
we should install instead. Or None if there isn't one. """
thispkgobsdict = self.up.checkForObsolete([po.pkgtup])
- if thispkgobsdict.has_key(po.pkgtup):
+ if po.pkgtup in thispkgobsdict:
obsoleting = thispkgobsdict[po.pkgtup][0]
obsoleting_pkg = self.getPackageObject(obsoleting)
return obsoleting_pkg
@@ -2699,7 +2857,7 @@ class YumBase(depsolve.Depsolve):
if not kwargs:
raise Errors.InstallError, _('Nothing specified to install')
- if kwargs.has_key('pattern'):
+ if 'pattern' in kwargs:
if kwargs['pattern'][0] == '@':
return self._at_groupinstall(kwargs['pattern'])
@@ -2765,7 +2923,7 @@ class YumBase(depsolve.Depsolve):
pkgs = use
- pkgs = packagesNewestByNameArch(pkgs)
+ pkgs = packagesNewestByName(pkgs)
pkgbyname = {}
for pkg in pkgs:
@@ -2815,7 +2973,7 @@ class YumBase(depsolve.Depsolve):
continue
# make sure this shouldn't be passed to update:
- if self.up.updating_dict.has_key(po.pkgtup):
+ if po.pkgtup in self.up.updating_dict:
txmbrs = self.update(po=po)
tx_return.extend(txmbrs)
continue
@@ -2882,7 +3040,8 @@ class YumBase(depsolve.Depsolve):
# and a remove, which also tries to remove the old version.
self.tsInfo.remove(ipkg.pkgtup)
break
- if ipkg.verGT(po):
+ for ipkg in self.rpmdb.searchNevra(name=po.name):
+ if ipkg.verGT(po) and not canCoinstall(ipkg.arch, po.arch):
self._add_prob_flags(rpm.RPMPROB_FILTER_OLDPACKAGE)
break
@@ -3005,7 +3164,7 @@ class YumBase(depsolve.Depsolve):
availpkgs.append(po)
- elif kwargs.has_key('pattern'):
+ elif 'pattern' in kwargs:
if kwargs['pattern'][0] == '@':
return self._at_groupinstall(kwargs['pattern'])
@@ -3080,7 +3239,7 @@ class YumBase(depsolve.Depsolve):
# This is done so we don't have to returnObsoletes(newest=True)
# It's a minor UI problem for RHEL, but might as well dtrt.
obs_pkgs = [self.getPackageObject(tup) for tup in obs_tups]
- for obsoleting_pkg in packagesNewestByNameArch(obs_pkgs):
+ for obsoleting_pkg in packagesNewestByName(obs_pkgs):
tx_return.extend(self.install(po=obsoleting_pkg))
for available_pkg in availpkgs:
for obsoleted in self.up.obsoleting_dict.get(available_pkg.pkgtup, []):
@@ -3186,7 +3345,7 @@ class YumBase(depsolve.Depsolve):
if po:
pkgs = [po]
else:
- if kwargs.has_key('pattern'):
+ if 'pattern' in kwargs:
if kwargs['pattern'][0] == '@':
return self._at_groupremove(kwargs['pattern'])
@@ -3246,9 +3405,10 @@ class YumBase(depsolve.Depsolve):
if not po:
try:
- po = YumLocalPackage(ts=self.rpmdb.readOnlyTS(), filename=pkg)
+ po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg,
+ ua=default_grabber.opts.user_agent)
except Errors.MiscError:
- self.logger.critical(_('Cannot open file: %s. Skipping.'), pkg)
+ self.logger.critical(_('Cannot open: %s. Skipping.'), pkg)
return tx_return
self.verbose_logger.log(logginglevels.INFO_2,
_('Examining %s: %s'), po.localpath, po)
@@ -3344,7 +3504,8 @@ class YumBase(depsolve.Depsolve):
if not po:
try:
- po = YumLocalPackage(ts=self.rpmdb.readOnlyTS(), filename=pkg)
+ po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg,
+ ua=default_grabber.opts.user_agent)
except Errors.MiscError:
self.logger.critical(_('Cannot open file: %s. Skipping.'), pkg)
return []
@@ -3427,7 +3588,8 @@ class YumBase(depsolve.Depsolve):
if not po:
try:
- po = YumLocalPackage(ts=self.rpmdb.readOnlyTS(), filename=pkg)
+ po = YumUrlPackage(self, ts=self.rpmdb.readOnlyTS(), url=pkg,
+ ua=default_grabber.opts.user_agent)
except Errors.MiscError:
self.logger.critical(_('Cannot open file: %s. Skipping.'), pkg)
return []
@@ -3535,49 +3697,59 @@ class YumBase(depsolve.Depsolve):
latest_installed_na = {}
latest_installed_n = {}
- for pkg in ipkgs:
- latest_installed_n[pkg.name] = pkg
+ for pkg in sorted(ipkgs):
+ if (pkg.name not in latest_installed_n or
+ pkg.verGT(latest_installed_n[pkg.name][0])):
+ latest_installed_n[pkg.name] = [pkg]
+ elif pkg.verEQ(latest_installed_n[pkg.name][0]):
+ latest_installed_n[pkg.name].append(pkg)
latest_installed_na[(pkg.name, pkg.arch)] = pkg
# Find "latest downgrade", ie. latest available pkg before
- # installed version.
+ # installed version. Indexed fromn the latest installed pkgtup.
downgrade_apkgs = {}
for pkg in sorted(apkgs):
na = (pkg.name, pkg.arch)
# Here we allow downgrades from .i386 => .noarch, or .i586 => .i386
# but not .i386 => .x86_64 (similar to update).
- key = na
- latest_installed = latest_installed_na
- if pkg.name in latest_installed_n and na not in latest_installed_na:
- if not canCoinstall(pkg.arch,latest_installed_n[pkg.name].arch):
- key = pkg.name
- latest_installed = latest_installed_n
-
- if key not in latest_installed:
+ lipkg = None
+ if na in latest_installed_na:
+ lipkg = latest_installed_na[na]
+ elif pkg.name in latest_installed_n:
+ for tlipkg in latest_installed_n[pkg.name]:
+ if not canCoinstall(pkg.arch, tlipkg.arch):
+ lipkg = tlipkg
+ # Use this so we don't get confused when we have
+ # different versions with different arches.
+ na = (pkg.name, lipkg.arch)
+ break
+
+ if lipkg is None:
if na not in warned_nas and not doing_group_pkgs:
msg = _('No Match for available package: %s') % pkg
self.logger.critical(msg)
warned_nas.add(na)
continue
- if pkg.verGE(latest_installed[key]):
+
+ if pkg.verGE(lipkg):
if na not in warned_nas:
msg = _('Only Upgrade available on package: %s') % pkg
self.logger.critical(msg)
warned_nas.add(na)
continue
+
warned_nas.add(na)
- if (na in downgrade_apkgs and
- pkg.verLE(downgrade_apkgs[na])):
+ if (lipkg.pkgtup in downgrade_apkgs and
+ pkg.verLE(downgrade_apkgs[lipkg.pkgtup])):
continue # Skip older than "latest downgrade"
- downgrade_apkgs[na] = pkg
+ downgrade_apkgs[lipkg.pkgtup] = pkg
tx_return = []
- for po in ipkgs:
- na = (po.name, po.arch)
- if na not in downgrade_apkgs:
+ for ipkg in ipkgs:
+ if ipkg.pkgtup not in downgrade_apkgs:
continue
- txmbrs = self.tsInfo.addDowngrade(downgrade_apkgs[na], po)
+ txmbrs = self.tsInfo.addDowngrade(downgrade_apkgs[ipkg.pkgtup],ipkg)
if not txmbrs: # Fail?
continue
self._add_prob_flags(rpm.RPMPROB_FILTER_OLDPACKAGE)
@@ -3724,13 +3896,17 @@ class YumBase(depsolve.Depsolve):
raise Errors.YumBaseError(_('GPG key retrieval failed: ') +
to_unicode(str(e)))
# Parse the key
- keys_info = misc.getgpgkeyinfo(rawkey, multiple=True)
+ try:
+ keys_info = misc.getgpgkeyinfo(rawkey, multiple=True)
+ except ValueError, e:
+ raise Errors.YumBaseError(_('Invalid GPG Key from %s: %s') %
+ (url, to_unicode(str(e))))
keys = []
for keyinfo in keys_info:
thiskey = {}
for info in ('keyid', 'timestamp', 'userid',
'fingerprint', 'raw_key'):
- if not keyinfo.has_key(info):
+ if info not in keyinfo:
raise Errors.YumBaseError, \
_('GPG key parsing failed: key does not have value %s') + info
thiskey[info] = keyinfo[info]
@@ -4080,7 +4256,10 @@ class YumBase(depsolve.Depsolve):
self.populateTs(test=1)
self.ts.check()
for prob in self.ts.problems():
- results.append(prob)
+ # Newer rpm (4.8.0+) has problem objects, older have just strings.
+ # Should probably move to using the new objects, when we can. For
+ # now just be compatible.
+ results.append(to_str(prob))
self.dsCallback = dscb
return results
@@ -4144,13 +4323,19 @@ class YumBase(depsolve.Depsolve):
if not force and os.geteuid() == 0:
return True # We are root, not forced, so happy with the global dir.
-
- cachedir = misc.getCacheDir(tmpdir, reuse)
+ try:
+ cachedir = misc.getCacheDir(tmpdir, reuse)
+ except (IOError, OSError), e:
+ self.logger.critical(_('Could not set cachedir: %s') % str(e))
+ cachedir = None
+
if cachedir is None:
return False # Tried, but failed, to get a "user" cachedir
- self.repos.setCacheDir(cachedir + varReplace(suffix, self.yumvar))
-
+ cachedir += varReplace(suffix, self.conf.yumvar)
+ self.repos.setCacheDir(cachedir)
+ self.rpmdb.setCacheDir(cachedir)
+ self.conf.cachedir = cachedir
return True # We got a new cache dir
def _does_this_update(self, pkg1, pkg2):
@@ -4170,3 +4355,4 @@ class YumBase(depsolve.Depsolve):
return False
return True
+
diff --git a/yum/comps.py b/yum/comps.py
index 2048c77..bbc1ac9 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -87,14 +87,14 @@ class CompsObj(object):
def nameByLang(self, lang):
for langcode in self._expand_languages(lang):
- if self.translated_name.has_key(langcode):
+ if langcode in self.translated_name:
return to_unicode(self.translated_name[langcode])
return to_unicode(self.name)
def descriptionByLang(self, lang):
for langcode in self._expand_languages(lang):
- if self.translated_description.has_key(langcode):
+ if langcode in self.translated_description:
return to_unicode(self.translated_description[langcode])
return to_unicode(self.description)
@@ -389,23 +389,14 @@ class Comps(object):
# lists, yet.
- def __sort_order(self, item1, item2):
- """ This sorts for machines, so is the same in all locales. """
- if item1.display_order > item2.display_order:
- return 1
- elif item1.display_order == item2.display_order:
- return cmp(item1.name, item2.name)
- else:
- return -1
-
def get_groups(self):
grps = self._groups.values()
- grps.sort(self.__sort_order)
+ grps.sort(key=lambda x: (x.display_order, x.name))
return grps
def get_categories(self):
cats = self._categories.values()
- cats.sort(self.__sort_order)
+ cats.sort(key=lambda x: (x.display_order, x.name))
return cats
groups = property(get_groups)
@@ -443,12 +434,22 @@ class Comps(object):
else:
match = re.compile(fnmatch.translate(item), flags=re.I).match
+ done = False
+ for group in self.groups:
+ for name in group.name, group.groupid, group.ui_name:
+ if match(name):
+ done = True
+ returns[group.groupid] = group
+ break
+ if done:
+ continue
+
+ # If we didn't match to anything in the current locale, try others
for group in self.groups:
- names = [ group.name, group.groupid ]
- names.extend(group.translated_name.values())
- for name in names:
+ for name in group.translated_name.values():
if match(name):
returns[group.groupid] = group
+ break
return returns.values()
@@ -460,7 +461,7 @@ class Comps(object):
for item in pattern.split(','):
item = item.strip()
- if self._categories.has_key(item):
+ if item in self._categories:
cat = self._categories[item]
returns[cat.categoryid] = cat
continue
@@ -470,12 +471,21 @@ class Comps(object):
else:
match = re.compile(fnmatch.translate(item), flags=re.I).match
+ done = False
for cat in self.categories:
- names = [ cat.name, cat.categoryid ]
- names.extend(cat.translated_name.values())
- for name in names:
+ for name in cat.name, cat.categoryid, cat.ui_name:
if match(name):
+ done = True
returns[cat.categoryid] = cat
+ break
+ if done:
+ continue
+
+ for cat in self.categories:
+ for name in cat.translated_name.values():
+ if match(name):
+ returns[cat.categoryid] = cat
+ break
return returns.values()
@@ -537,7 +547,7 @@ class Comps(object):
if len(group.mandatory_packages) > 0:
group.installed = True
for pkgname in group.mandatory_packages:
- if not inst_pkg_names.has_key(pkgname):
+ if pkgname not in inst_pkg_names:
group.installed = False
break
# if it doesn't have any of those then see if it has ANY of the
diff --git a/yum/config.py b/yum/config.py
index 2ae7e89..ad8db7e 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -39,6 +39,8 @@ if not _use_iniparse:
from ConfigParser import ConfigParser
import rpmUtils.transaction
import Errors
+import types
+from misc import get_uuid
# Alter/patch these to change the default checking...
__pkgs_gpgcheck_default__ = False
@@ -91,8 +93,8 @@ class Option(object):
value = self.parse(value)
except ValueError, e:
# Add the field name onto the error
- raise ValueError('Error parsing %r: %s' % (value, str(e)))
-
+ raise ValueError('Error parsing "%s = %r": %s' % (self._optname,
+ value, str(e)))
setattr(obj, self._attrname, value)
def setup(self, obj, name):
@@ -102,6 +104,7 @@ class Option(object):
@param obj: BaseConfig (or subclass) instance.
@param name: Name of the option.
'''
+ self._optname = name
setattr(obj, self._attrname, copy.copy(self.default))
def clone(self):
@@ -599,7 +602,8 @@ class StartupConf(BaseConfig):
gaftonmode = BoolOption(False)
syslog_ident = Option()
syslog_facility = Option('LOG_DAEMON')
-
+ persistdir = Option('/var/lib/yum')
+
class YumConf(StartupConf):
'''
Configuration option definitions for yum.conf\'s [main] section.
@@ -610,7 +614,7 @@ class YumConf(StartupConf):
recent = IntOption(7, range_min=0)
cachedir = Option('/var/cache/yum')
- persistdir = Option('/var/lib/yum')
+
keepcache = BoolOption(True)
logfile = Option('/var/log/yum.log')
reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
@@ -706,8 +710,32 @@ class YumConf(StartupConf):
history_record = BoolOption(True)
history_record_packages = ListOption(['yum', 'rpm'])
+ rpmverbosity = Option('info')
+
_reposlist = []
+ def dump(self):
+ output = '[main]\n'
+ # we exclude all vars which start with _ or are in this list:
+ excluded_vars = ('cfg', 'uid', 'yumvar', 'progress_obj', 'failure_obj',
+ 'disable_excludes', 'config_file_age', 'config_file_path',
+ )
+ for attr in dir(self):
+ if attr.startswith('_'):
+ continue
+ if attr in excluded_vars:
+ continue
+ if isinstance(getattr(self, attr), types.MethodType):
+ continue
+ res = getattr(self, attr)
+ if not res:
+ res = ''
+ if type(res) == types.ListType:
+ res = ',\n '.join(res)
+ output = output + '%s = %s\n' % (attr, res)
+
+ return output
+
class RepoConf(BaseConfig):
'''
Option definitions for repository INI file sections.
@@ -764,6 +792,7 @@ class RepoConf(BaseConfig):
sslclientcert = Inherit(YumConf.sslclientcert)
sslclientkey = Inherit(YumConf.sslclientkey)
+ skip_if_unavailable = BoolOption(False)
class VersionGroupConf(BaseConfig):
pkglist = ListOption()
@@ -805,6 +834,8 @@ def readStartupConfig(configfile, root):
startupconf._parser = parser
# setup the release ver here
startupconf.releasever = _getsysver(startupconf.installroot, startupconf.distroverpkg)
+ uuidfile = '%s/%s/uuid' % (startupconf.installroot, startupconf.persistdir)
+ startupconf.uuid = get_uuid(uuidfile)
return startupconf
@@ -823,7 +854,8 @@ def readMainConfig(startupconf):
yumvars['basearch'] = startupconf.basearch
yumvars['arch'] = startupconf.arch
yumvars['releasever'] = startupconf.releasever
-
+ yumvars['uuid'] = startupconf.uuid
+
# Read [main] section
yumconf = YumConf()
yumconf.populate(startupconf._parser, 'main')
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 40be000..c1e90c5 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -142,7 +142,7 @@ class Depsolve(object):
self._ts.setFlags(0) # reset everything.
for flag in self.conf.tsflags:
- if ts_flags_to_rpm.has_key(flag):
+ if flag in ts_flags_to_rpm:
self._ts.addTsFlag(ts_flags_to_rpm[flag])
else:
self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
@@ -188,13 +188,14 @@ class Depsolve(object):
"""takes a packageObject, returns 1 or 0 depending on if the package
should/can be installed multiple times with different vers
like kernels and kernel modules, for example"""
-
- if po.name in self.conf.installonlypkgs:
+
+ iopkgs = set(self.conf.installonlypkgs)
+ if po.name in iopkgs:
return True
- provides = po.provides_names
- if filter (lambda prov: prov in self.conf.installonlypkgs, provides):
- return True
+ for prov in po.provides_names:
+ if prov in iopkgs:
+ return True
return False
@@ -223,7 +224,7 @@ class Depsolve(object):
for txmbr in self.tsInfo.getMembers():
self.verbose_logger.log(logginglevels.DEBUG_3, _('Member: %s'), txmbr)
if txmbr.ts_state in ['u', 'i']:
- if ts_elem.has_key((txmbr.pkgtup, 'i')):
+ if (txmbr.pkgtup, 'i') in ts_elem:
continue
rpmfile = txmbr.po.localPkg()
if os.path.exists(rpmfile):
@@ -247,7 +248,7 @@ class Depsolve(object):
self.dsCallback.pkgAdded(txmbr.pkgtup, txmbr.ts_state)
elif txmbr.ts_state in ['e']:
- if ts_elem.has_key((txmbr.pkgtup, txmbr.ts_state)):
+ if (txmbr.pkgtup, txmbr.ts_state) in ts_elem:
continue
self.ts.addErase(txmbr.po.idx)
if self.dsCallback: self.dsCallback.pkgAdded(txmbr.pkgtup, 'e')
@@ -307,6 +308,16 @@ class Depsolve(object):
def _prco_req2req(self, req):
return self._prco_req_nfv2req(req[0], req[1], req[2])
+ def _err_missing_requires(self, reqPo, reqTup):
+ if hasattr(self.dsCallback, 'format_missing_requires'):
+ msg = self.dsCallback.format_missing_requires(reqPo, reqTup)
+ if msg is not None: # PK
+ return self.dsCallback.format_missing_requires(reqPo, reqTup)
+ (needname, needflags, needversion) = reqTup
+ ui_req = rpmUtils.miscutils.formatRequire(needname, needversion,
+ needflags)
+ return _('%s requires %s') % (reqPo, ui_req)
+
def _requiringFromInstalled(self, requiringPo, requirement, errorlist):
"""processes the dependency resolution for a dep where the requiring
package is installed"""
@@ -331,7 +342,7 @@ class Depsolve(object):
needpo = None
providers = []
- if self.cheaterlookup.has_key((needname, needflags, needversion)):
+ if (needname, needflags, needversion) in self.cheaterlookup:
self.verbose_logger.log(logginglevels.DEBUG_2, _('Needed Require has already been looked up, cheating'))
cheater_po = self.cheaterlookup[(needname, needflags, needversion)]
providers = [cheater_po]
@@ -413,9 +424,7 @@ class Depsolve(object):
if self.pkgSack is None:
return self._requiringFromTransaction(requiringPo, requirement, errorlist)
else:
- prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
- msg = _('Unresolvable requirement %s for %s') % (niceformatneed,
- prob_pkg)
+ msg = self._err_missing_requires(requiringPo, requirement)
self.verbose_logger.log(logginglevels.DEBUG_2, msg)
checkdeps = 0
missingdep = 1
@@ -513,10 +522,7 @@ class Depsolve(object):
if len(provSack) == 0: # unresolveable
missingdep = 1
- prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
- msg = _('Missing Dependency: %s is needed by package %s') % \
- (rpmUtils.miscutils.formatRequire(needname, needversion, needflags),
- prob_pkg)
+ msg = self._err_missing_requires(requiringPo, requirement)
errorlist.append(msg)
return checkdeps, missingdep
@@ -559,8 +565,7 @@ class Depsolve(object):
if self.rpmdb.contains(po=best): # is it already installed?
missingdep = 1
checkdeps = 0
- prob_pkg = "%s (%s)" % (requiringPo,requiringPo.repoid)
- msg = _('Missing Dependency: %s is needed by package %s') % (needname, prob_pkg)
+ msg = self._err_missing_requires(requiringPo, requirement)
errorlist.append(msg)
return checkdeps, missingdep
@@ -589,7 +594,7 @@ class Depsolve(object):
# if we had other packages with this name.arch that we found
# before, they're not going to be installed anymore, so we
# should mark them to be re-checked
- if upgraded.has_key(best.pkgtup):
+ if best.pkgtup in upgraded:
map(self.tsInfo.remove, upgraded[best.pkgtup])
checkdeps = 1
@@ -757,9 +762,18 @@ class Depsolve(object):
self.tsInfo.changed = False
if len(errors) > 0:
errors = unique(errors)
+ # We immediately display this in cli, so don't show it twice.
+ # Plus skip-broken can get here N times. Might be worth keeping
+ # around for debugging?
+ done = set() # Same as the unique above
for po,wpo,err in self.po_with_problems:
- self.verbose_logger.info(_("%s from %s has depsolving problems") % (po,po.repoid))
- self.verbose_logger.info(" --> %s" % (err))
+ if (po,err) in done:
+ continue
+ done.add((po, err))
+ self.verbose_logger.log(logginglevels.DEBUG_4,
+ _("%s from %s has depsolving problems") % (po, po.repoid))
+ err = err.replace('\n', '\n --> ')
+ self.verbose_logger.log(logginglevels.DEBUG_4," --> %s" % err)
return (1, errors)
if len(self.tsInfo) > 0:
@@ -812,18 +826,15 @@ class Depsolve(object):
return CheckDeps, CheckInstalls, CheckRemoves, any_missing
@staticmethod
- def _sort_reqs(pkgtup1, pkgtup2):
- """ Sort the requires for a package from most "narrow" to least,
+ def _sort_req_key(pkgtup):
+ """ Get a sort key for a package requires from most "narrow" to least,
this tries to ensure that if we have two reqs like
"libfoo = 1.2.3-4" and "foo-api" (which is also provided by
libxyz-foo) that we'll get just libfoo.
There are other similar cases this "handles"."""
- mapper = {'EQ' : 1, 'LT' : 2, 'LE' : 3, 'GT' : 4, 'GE' : 5,
- None : 99}
- ret = mapper.get(pkgtup1[1], 10) - mapper.get(pkgtup2[1], 10)
- if ret:
- return ret
+ mapper = {'EQ' : 1, 'LT' : 2, 'LE' : 3, 'GT' : 4, 'GE' : 5, None : 99}
+ flagscore = mapper.get(pkgtup[1], 10)
# This is pretty magic, basically we want an explicit:
#
@@ -835,16 +846,16 @@ class Depsolve(object):
#
# ...because sometimes the libfoo.so.0() is provided by multiple
# packages. Do we need more magic for other implicit deps. here?
- def _req_name2val(name):
- if (name.startswith("lib") and
- (name.endswith("()") or name.endswith("()(64bit)"))):
- return 99 # Processes these last
- return 0
- return _req_name2val(pkgtup1[0]) - _req_name2val(pkgtup2[0])
+
+ namescore = 0
+ if pkgtup[0].startswith("lib") and \
+ (pkgtup[0].endswith("()") or pkgtup[0].endswith("()(64bit)")):
+ namescore = 99 # Processes these last
+
+ return (flagscore, namescore)
def _checkInstall(self, txmbr):
txmbr_reqs = txmbr.po.returnPrco('requires')
- txmbr_provs = set(txmbr.po.returnPrco('provides'))
# if this is an update, we should check what the old
# requires were to make things faster
@@ -854,11 +865,9 @@ class Depsolve(object):
oldreqs = set(oldreqs)
ret = []
- for req in sorted(txmbr_reqs, cmp=self._sort_reqs):
+ for req in sorted(txmbr_reqs, key=self._sort_req_key):
if req[0].startswith('rpmlib('):
continue
- if req in txmbr_provs:
- continue
if req in oldreqs and self.rpmdb.getProvides(*req):
continue
@@ -885,7 +894,7 @@ class Depsolve(object):
# if this is an update, we should check what the new package
# provides to make things faster
newpoprovs = {}
- for newpo in txmbr.updated_by:
+ for newpo in txmbr.updated_by + txmbr.obsoleted_by:
for p in newpo.provides:
newpoprovs[p] = 1
ret = []
@@ -900,38 +909,49 @@ class Depsolve(object):
# FIXME: This is probably the best place to fix the postfix rename
# problem long term (post .21) ... see compare_providers.
for pkg, hits in self.tsInfo.getRequires(*prov).iteritems():
- for rn, rf, rv in hits:
+ for hit in hits:
+ # See if the update solves the problem...
+ found = False
+ for newpo in txmbr.updated_by:
+ if newpo.checkPrco('provides', hit):
+ found = True
+ break
+ if found: continue
+ for newpo in txmbr.obsoleted_by:
+ if newpo.checkPrco('provides', hit):
+ found = True
+ break
+ if found: continue
+
+ # It doesn't, so see what else might...
+ rn, rf, rv = hit
if not self.tsInfo.getProvides(rn, rf, rv):
ret.append( (pkg, self._prco_req_nfv2req(rn, rf, rv)) )
return ret
def _checkFileRequires(self):
fileRequires = set()
+ nfileRequires = set() # These need to be looked up in the rpmdb.
reverselookup = {}
ret = []
# generate list of file requirement in rpmdb
if self.installedFileRequires is None:
- self.installedFileRequires = {}
- self.installedUnresolvedFileRequires = set()
- resolved = set()
- for pkg in self.rpmdb.returnPackages():
- for name, flag, evr in pkg.requires:
- if not name.startswith('/'):
- continue
- self.installedFileRequires.setdefault(pkg, []).append(name)
- if name not in resolved:
- dep = self.rpmdb.getProvides(name, flag, evr)
- resolved.add(name)
- if not dep:
- self.installedUnresolvedFileRequires.add(name)
+ self.installedFileRequires, \
+ self.installedUnresolvedFileRequires, \
+ self.installedFileProviders = self.rpmdb.fileRequiresData()
# get file requirements from packages not deleted
- for po, files in self.installedFileRequires.iteritems():
- if not self._tsInfo.getMembersWithState(po.pkgtup, output_states=TS_REMOVE_STATES):
+ todel = []
+ for pkgtup, files in self.installedFileRequires.iteritems():
+ if self._tsInfo.getMembersWithState(pkgtup, output_states=TS_REMOVE_STATES):
+ todel.append(pkgtup)
+ else:
fileRequires.update(files)
for filename in files:
- reverselookup.setdefault(filename, []).append(po)
+ reverselookup.setdefault(filename, []).append(pkgtup)
+ for pkgtup in todel:
+ del self.installedFileRequires[pkgtup]
fileRequires -= self.installedUnresolvedFileRequires
@@ -939,6 +959,8 @@ class Depsolve(object):
for txmbr in self._tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES):
for name, flag, evr in txmbr.po.requires:
if name.startswith('/'):
+ pt = txmbr.po.pkgtup
+ self.installedFileRequires.setdefault(pt, []).append(name)
# check if file requires was already unresolved in update
if name in self.installedUnresolvedFileRequires:
already_broken = False
@@ -948,23 +970,79 @@ class Depsolve(object):
break
if already_broken:
continue
+ if name not in fileRequires:
+ nfileRequires.add(name)
fileRequires.add(name)
- reverselookup.setdefault(name, []).append(txmbr.po)
+ reverselookup.setdefault(name, []).append(txmbr.po.pkgtup)
+
+ todel = []
+ for fname in self.installedFileProviders:
+ niFP_fname = []
+ for pkgtup in self.installedFileProviders[fname]:
+ if self._tsInfo.getMembersWithState(pkgtup, output_states=TS_REMOVE_STATES):
+ continue
+ niFP_fname.append(pkgtup)
+
+ if not niFP_fname:
+ todel.append(fname)
+ continue
+
+ self.installedFileProviders[fname] = niFP_fname
+ for fname in todel:
+ del self.installedFileProviders[fname]
# check the file requires
+ iFP = self.installedFileProviders
for filename in fileRequires:
- if not self.tsInfo.getOldProvides(filename) and not self.tsInfo.getNewProvides(filename):
- for po in reverselookup[filename]:
- ret.append( (po, (filename, 0, '')) )
+ # In theory we need this to be:
+ #
+ # nprov, filename in iFP (or new), oprov
+ #
+ # ...this keeps the cache exactly the same as the non-cached data.
+ # However that also means that we'll always need the filelists, so
+ # we do:
+ #
+ # filename in iFP (if found return), oprov (if found return),
+ # nprov
+ #
+ # ...this means we'll always get the same _result_ (as we only need
+ # to know if _something_ provides), but our cache will be off on
+ # what does/doesn't provide the file.
+ if filename in self.installedFileProviders:
+ continue
- return ret
+ oprov = self.tsInfo.getOldProvides(filename)
+ if oprov:
+ iFP.setdefault(filename, []).extend([po.pkgtup for po in oprov])
+ continue
+
+ nprov = self.tsInfo.getNewProvides(filename)
+ if nprov:
+ iFP.setdefault(filename, []).extend([po.pkgtup for po in nprov])
+ continue
+
+ for pkgtup in reverselookup[filename]:
+ po = self.tsInfo.getMembersWithState(pkgtup, TS_INSTALL_STATES)
+ if po:
+ po = po[0].po # Should only have one
+ else:
+ po = self.getInstalledPackageObject(pkgtup)
+ ret.append( (po, (filename, 0, '')) )
+ self.rpmdb.transactionCacheFileRequires(self.installedFileRequires,
+ self.installedUnresolvedFileRequires,
+ self.installedFileProviders,
+ ret)
+
+ return ret
def _checkConflicts(self):
ret = [ ]
- for po in self.rpmdb.returnPackages():
+ cpkgs = []
+ for po in self.rpmdb.returnConflictPackages():
if self.tsInfo.getMembersWithState(po.pkgtup, output_states=TS_REMOVE_STATES):
continue
+ cpkgs.append(po)
for conflict in po.returnPrco('conflicts'):
(r, f, v) = conflict
for conflicting_po in self.tsInfo.getNewProvides(r, f, v):
@@ -974,30 +1052,35 @@ class Depsolve(object):
conflicting_po) )
for txmbr in self.tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES):
po = txmbr.po
+ done = False
for conflict in txmbr.po.returnPrco('conflicts'):
+ if not done:
+ cpkgs.append(txmbr.po)
+ done = True
(r, f, v) = conflict
for conflicting_po in self.tsInfo.getProvides(r, f, v):
if conflicting_po.pkgtup[0] == po.pkgtup[0] and conflicting_po.pkgtup[2:] == po.pkgtup[2:]:
continue
ret.append( (po, self._prco_req_nfv2req(r, f, v),
conflicting_po) )
+ self.rpmdb.transactionCacheConflictPackages(cpkgs)
return ret
-
def isPackageInstalled(self, pkgname):
- installed = False
- if self.rpmdb.contains(name=pkgname):
- installed = True
-
lst = self.tsInfo.matchNaevr(name = pkgname)
for txmbr in lst:
if txmbr.output_state in TS_INSTALL_STATES:
return True
- if installed and len(lst) > 0:
- # if we get here, then it was installed, but it's in the tsInfo
- # for an erase or obsoleted --> not going to be installed at end
+
+ if len(lst) > 0:
+ # if we get here then it's in the tsInfo for an erase or obsoleted
+ # --> not going to be installed
+ return False
+
+ if not self.rpmdb.contains(name=pkgname):
return False
- return installed
+
+ return True
_isPackageInstalled = isPackageInstalled
def _compare_providers(self, pkgs, reqpo):
@@ -1005,13 +1088,6 @@ class Depsolve(object):
return a dictionary of po=score"""
self.verbose_logger.log(logginglevels.DEBUG_4,
_("Running compare_providers() for %s") %(str(pkgs)))
-
- def _cmp_best_providers(x, y):
- """ Compare first by score, and then compare the pkgs if the score
- is the same. Note that this sorts in reverse. """
- ret = cmp(y[1], x[1])
- if ret: return ret
- return cmp(y[0], x[0])
def _common_prefix_len(x, y, minlen=2):
num = min(len(x), len(y))
@@ -1160,6 +1236,10 @@ class Depsolve(object):
self.verbose_logger.log(logginglevels.DEBUG_4,
_('common sourcerpm %s and %s' % (po, reqpo)))
pkgresults[po] += 20
+ if self.isPackageInstalled(po.base_package_name):
+ self.verbose_logger.log(logginglevels.DEBUG_4,
+ _('base package %s is installed for %s' % (po.base_package_name, po)))
+ pkgresults[po] += 5 # Same as ipkgresults above.
if reqpo:
cpl = _common_prefix_len(po.name, reqpo.name)
if cpl > 2:
@@ -1167,10 +1247,11 @@ class Depsolve(object):
_('common prefix of %s between %s and %s' % (cpl, po, reqpo)))
pkgresults[po] += cpl*2
-
+
pkgresults[po] += (len(po.name)*-1)
- bestorder = sorted(pkgresults.items(), cmp=_cmp_best_providers)
+ bestorder = sorted(pkgresults.items(),
+ key=lambda x: (x[1], x[0]), reverse=True)
self.verbose_logger.log(logginglevels.DEBUG_4,
_('Best Order: %s' % str(bestorder)))
diff --git a/yum/history.py b/yum/history.py
index 095c76b..8de7459 100644
--- a/yum/history.py
+++ b/yum/history.py
@@ -286,7 +286,7 @@ class YumHistory:
def _ipkg2pid(self, po):
csum = None
yumdb = po.yumdb_info
- if 'checksum_type' in yumdb and 'checksum_type' in yumdb:
+ if 'checksum_type' in yumdb and 'checksum_data' in yumdb:
csum = "%s:%s" % (yumdb.checksum_type, yumdb.checksum_data)
return self._pkgtup2pid(po.pkgtup, csum)
def pkg2pid(self, po):
@@ -539,23 +539,14 @@ class YumHistory:
return ret
- def last(self):
- """ This is the last full transaction. So any imcomplete transactions
- do not count. """
- cur = self._get_cursor()
- sql = """SELECT tid,
- trans_beg.timestamp AS beg_ts,
- trans_beg.rpmdb_version AS beg_rv,
- trans_end.timestamp AS end_ts,
- trans_end.rpmdb_version AS end_rv,
- loginuid, return_code
- FROM trans_beg JOIN trans_end USING(tid)
- ORDER BY beg_ts DESC, tid ASC
- LIMIT 1"""
- executeSQL(cur, sql)
- for row in cur:
- return YumHistoryTransaction(self, row)
- return None
+ def last(self, complete_transactions_only=True):
+ """ This is the last full transaction. So any incomplete transactions
+ do not count, by default. """
+ ret = self.old([], 1, complete_transactions_only)
+ if not ret:
+ return None
+ assert len(ret) == 1
+ return ret[0]
def _yieldSQLDataList(self, patterns, fields, ignore_case):
"""Yields all the package data for the given params. """
@@ -620,6 +611,12 @@ class YumHistory:
if self._db_file == _db_file:
os.rename(_db_file, _db_file + '.old')
self._db_file = _db_file
+
+ if self.conf.writable and not os.path.exists(self._db_file):
+ # make them default to 0600 - sysadmin can change it later
+ # if they want
+ fo = os.open(self._db_file, os.O_CREAT, 0600)
+ os.close(fo)
cur = self._get_cursor()
ops = ['''\
diff --git a/yum/i18n.py b/yum/i18n.py
index e8ab4ac..6b9eab5 100755
--- a/yum/i18n.py
+++ b/yum/i18n.py
@@ -82,11 +82,10 @@ def __utf8_bisearch(ucs, table):
return False
-def __utf8_ucp_width(ucs):
- """ Get the textual width of a ucs character. """
- # sorted list of non-overlapping intervals of non-spacing characters
- # generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c"
- combining = [
+
+# sorted list of non-overlapping intervals of non-spacing characters
+# generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c"
+__combining = (
( 0x0300, 0x036F ), ( 0x0483, 0x0486 ), ( 0x0488, 0x0489 ),
( 0x0591, 0x05BD ), ( 0x05BF, 0x05BF ), ( 0x05C1, 0x05C2 ),
( 0x05C4, 0x05C5 ), ( 0x05C7, 0x05C7 ), ( 0x0600, 0x0603 ),
@@ -134,7 +133,10 @@ def __utf8_ucp_width(ucs):
( 0x10A38, 0x10A3A ), ( 0x10A3F, 0x10A3F ), ( 0x1D167, 0x1D169 ),
( 0x1D173, 0x1D182 ), ( 0x1D185, 0x1D18B ), ( 0x1D1AA, 0x1D1AD ),
( 0x1D242, 0x1D244 ), ( 0xE0001, 0xE0001 ), ( 0xE0020, 0xE007F ),
- ( 0xE0100, 0xE01EF )]
+ ( 0xE0100, 0xE01EF ))
+
+def __utf8_ucp_width(ucs):
+ """ Get the textual width of a ucs character. """
# test for 8-bit control characters
if ucs == 0:
@@ -143,7 +145,7 @@ def __utf8_ucp_width(ucs):
if ucs < 32 or (ucs >= 0x7f and ucs < 0xa0):
return (-1)
- if __utf8_bisearch(ucs, combining):
+ if __utf8_bisearch(ucs, __combining):
return 0
# if we arrive here, ucs is not a combining or C0/C1 control character
diff --git a/yum/mdparser.py b/yum/mdparser.py
index c74608d..2753dad 100644
--- a/yum/mdparser.py
+++ b/yum/mdparser.py
@@ -22,6 +22,9 @@ except ImportError:
iterparse = cElementTree.iterparse
from cStringIO import StringIO
+import warnings
+
+import Errors
#TODO: document everything here
@@ -79,7 +82,12 @@ class BaseEntry:
return self._p.values()
def has_key(self, k):
- return self._p.has_key(k)
+ warnings.warn('has_key() will go away in a future version of Yum.\n',
+ Errors.YumFutureDeprecationWarning, stacklevel=2)
+ return k in self._p
+
+ def __iter__(self):
+ return iter(self._p)
def __str__(self):
out = StringIO()
diff --git a/yum/metalink.py b/yum/metalink.py
index c7f5f83..24da633 100755
--- a/yum/metalink.py
+++ b/yum/metalink.py
@@ -55,6 +55,7 @@ class MetaLinkFile:
""" Parse the file metadata out of a metalink file. """
def __init__(self, elem):
+ # We aren't "using" any of these, just storing them.
chksums = set(["md5", 'sha1', 'sha256', 'sha512'])
for celem in elem:
diff --git a/yum/misc.py b/yum/misc.py
index 16ffca0..d63993b 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -17,6 +17,7 @@ import glob
import pwd
import fnmatch
import bz2
+import gzip
from stat import *
try:
import gpgme
@@ -78,8 +79,8 @@ def re_glob(s):
""" Tests if a string is a shell wildcard. """
global _re_compiled_glob_match
if _re_compiled_glob_match is None:
- _re_compiled_glob_match = re.compile('.*([*?]|\[.+\])')
- return _re_compiled_glob_match.match(s)
+ _re_compiled_glob_match = re.compile('[*?]|\[.+\]').search
+ return _re_compiled_glob_match(s)
_re_compiled_filename_match = None
def re_filename(s):
@@ -87,8 +88,8 @@ def re_filename(s):
classes wrong (are they supported), and ranges in character classes. """
global _re_compiled_filename_match
if _re_compiled_filename_match is None:
- _re_compiled_filename_match = re.compile('^(/|[*?]|\[[^]]*/[^]]*\])')
- return _re_compiled_filename_match.match(s)
+ _re_compiled_filename_match = re.compile('[/*?]|\[[^]]*/[^]]*\]').match
+ return _re_compiled_filename_match(s)
def re_primary_filename(filename):
""" Tests if a filename string, can be matched against just primary.
@@ -115,14 +116,27 @@ def re_full_search_needed(s):
""" Tests if a string needs a full nevra match, instead of just name. """
global _re_compiled_full_match
if _re_compiled_full_match is None:
- one = re.compile('.*[-\.\*\?\[\]].*.$') # Any wildcard or - seperator
- two = re.compile('^[0-9]') # Any epoch, for envra
+ # A glob, or a "." or "-" separator, followed by something (the ".")
+ one = re.compile('.*([-.*?]|\[.+\]).').match
+ # Any epoch, for envra
+ two = re.compile('[0-9]+:').match
_re_compiled_full_match = (one, two)
for rec in _re_compiled_full_match:
- if rec.match(s):
+ if rec(s):
return True
return False
+def re_remote_url(s):
+ """ Tests if a string is a "remote" URL, http, https, ftp. """
+ s = s.lower()
+ if s.startswith("http://"):
+ return True
+ if s.startswith("https://"):
+ return True
+ if s.startswith("ftp://"):
+ return True
+ return False
+
###########
# Title: Remove duplicates from a sequence
# Submitter: Tim Peters
@@ -197,7 +211,7 @@ class Checksums:
""" Generate checksum(s), on given pieces of data. Producing the
Length and the result(s) when complete. """
- def __init__(self, checksums=None, ignore_missing=False):
+ def __init__(self, checksums=None, ignore_missing=False, ignore_none=False):
if checksums is None:
checksums = _default_checksums
self._sumalgos = []
@@ -220,7 +234,7 @@ class Checksums:
done.add(sumtype)
self._sumtypes.append(sumtype)
self._sumalgos.append(sumalgo)
- if not done:
+ if not done and not ignore_none:
raise MiscError, 'Error Checksumming, no valid checksum type'
def __len__(self):
@@ -244,6 +258,8 @@ class Checksums:
def hexdigest(self, checksum=None):
if checksum is None:
+ if not self._sumtypes:
+ return None
checksum = self._sumtypes[0]
if checksum == 'sha':
checksum = 'sha1'
@@ -257,6 +273,8 @@ class Checksums:
def digest(self, checksum=None):
if checksum is None:
+ if not self._sumtypes:
+ return None
checksum = self._sumtypes[0]
if checksum == 'sha':
checksum = 'sha1'
@@ -267,9 +285,9 @@ class AutoFileChecksums:
""" Generate checksum(s), on given file/fileobject. Pretending to be a file
object (overrrides read). """
- def __init__(self, fo, checksums, ignore_missing=False):
+ def __init__(self, fo, checksums, ignore_missing=False, ignore_none=False):
self._fo = fo
- self.checksums = Checksums(checksums, ignore_missing)
+ self.checksums = Checksums(checksums, ignore_missing, ignore_none)
def __getattr__(self, attr):
return getattr(self._fo, attr)
@@ -323,7 +341,7 @@ def getFileList(path, ext, filelist):
if os.path.isdir(path + '/' + d):
filelist = getFileList(path + '/' + d, ext, filelist)
else:
- if d[-extlen:].lower() == '%s' % (ext):
+ if not ext or d[-extlen:].lower() == '%s' % (ext):
newpath = os.path.normpath(path + '/' + d)
filelist.append(newpath)
@@ -354,7 +372,7 @@ def procgpgkey(rawkey):
# TODO: CRC checking? (will RPM do this anyway?)
# Normalise newlines
- rawkey = re.compile('(\n|\r\n|\r)').sub('\n', rawkey)
+ rawkey = re.sub('\r\n?', '\n', rawkey)
# Extract block
block = StringIO()
@@ -615,7 +633,7 @@ def refineSearchPattern(arg):
"""Takes a search string from the cli for Search or Provides
and cleans it up so it doesn't make us vomit"""
- if re.match('.*[\*,\[,\],\{,\},\?,\+].*', arg):
+ if re.search('[*{}?+]|\[.+\]', arg):
restring = fnmatch.translate(arg)
else:
restring = re.escape(arg)
@@ -644,9 +662,9 @@ def bunzipFile(source,dest):
destination.close()
s_fn.close()
-def get_running_kernel_version_release(ts):
- """This takes the output of uname and figures out the (version, release)
- tuple for the running kernel."""
+def get_running_kernel_pkgtup(ts):
+ """This takes the output of uname and figures out the pkgtup of the running
+ kernel (name, arch, epoch, version, release)."""
ver = os.uname()[2]
# we glob for the file that MIGHT have this kernel
@@ -655,10 +673,20 @@ def get_running_kernel_version_release(ts):
for fn in fns:
mi = ts.dbMatch('basenames', fn)
for h in mi:
- return (h['version'], h['release'])
+ e = h['epoch']
+ if h['epoch'] is None:
+ e = '0'
+ return (h['name'], h['arch'], e, h['version'], h['release'])
- return (None, None)
+ return (None, None, None, None, None)
+def get_running_kernel_version_release(ts):
+ """This takes the output of uname and figures out the (version, release)
+ tuple for the running kernel."""
+ pkgtup = get_running_kernel_pkgtup(ts)
+ if pkgtup[0] is not None:
+ return (pkgtup[3], pkgtup[4])
+ return (None, None)
def find_unfinished_transactions(yumlibpath='/var/lib/yum'):
"""returns a list of the timestamps from the filenames of the unfinished
@@ -671,6 +699,8 @@ def find_unfinished_transactions(yumlibpath='/var/lib/yum'):
tsdones = glob.glob(tsdoneg)
for fn in tsalls:
+ if fn.endswith('disabled'):
+ continue
trans = os.path.basename(fn)
timestamp = trans.replace('transaction-all.','')
timestamps.append(timestamp)
@@ -848,3 +878,95 @@ def get_my_lang_code():
return mylang
+def return_running_pids():
+ """return list of running processids, excluding this one"""
+ mypid = os.getpid()
+ pids = []
+ for fn in glob.glob('/proc/[0123456789]*'):
+ if mypid == os.path.basename(fn):
+ continue
+ pids.append(os.path.basename(fn))
+ return pids
+
+def get_open_files(pid):
+ """returns files open from this pid"""
+ files = []
+ maps_f = '/proc/%s/maps' % pid
+ try:
+ maps = open(maps_f, 'r')
+ except (IOError, OSError), e:
+ return files
+
+ for line in maps:
+ if line.find('fd:') == -1:
+ continue
+ line = line.replace('\n', '')
+ slash = line.find('/')
+ filename = line[slash:]
+ filename = filename.replace('(deleted)', '') #only mildly retarded
+ filename = filename.strip()
+ if filename not in files:
+ files.append(filename)
+
+ cli_f = '/proc/%s/cmdline' % pid
+ try:
+ cli = open(cli_f, 'r')
+ except (IOError, OSError), e:
+ return files
+
+ cmdline = cli.read()
+ if cmdline.find('\00') != -1:
+ cmds = cmdline.split('\00')
+ for i in cmds:
+ if i.startswith('/'):
+ files.append(i)
+
+ return files
+
+def get_uuid(savepath):
+ """create, store and return a uuid. If a stored one exists, report that
+ if it cannot be stored, return a random one"""
+ if os.path.exists(savepath):
+ return open(savepath, 'r').read()
+ else:
+ try:
+ from uuid import uuid4
+ except ImportError:
+ myid = open('/proc/sys/kernel/random/uuid', 'r').read()
+ else:
+ myid = str(uuid4())
+
+ try:
+ sf = open(savepath, 'w')
+ sf.write(myid)
+ sf.flush()
+ sf.close()
+ except (IOError, OSError), e:
+ pass
+
+ return myid
+
+def decompress(filename):
+ """take a filename and decompress it into the same relative location.
+ if the file is not compressed just return the file"""
+ out = filename
+ if filename.endswith('.gz'):
+ out = filename.replace('.gz', '')
+ decom = gzip.open(filename)
+ fo = open(out, 'w')
+ fo.write(decom.read())
+ fo.flush()
+ fo.close()
+ decom.close()
+ elif filename.endswith('.bz') or filename.endswith('.bz2'):
+ if filename.endswith('.bz'):
+ out = filename.replace('.bz','')
+ else:
+ out = filename.replace('.bz2', '')
+ bunzipFile(filename, out)
+
+ #add magical lzma/xz trick here
+
+ return out
+
+
diff --git a/yum/packageSack.py b/yum/packageSack.py
index 33fdbfe..95b278a 100644
--- a/yum/packageSack.py
+++ b/yum/packageSack.py
@@ -233,7 +233,9 @@ class PackageSackBase(object):
def returnNewestByName(self, name=None, patterns=None, ignore_case=False):
"""return list of newest packages based on name matching
this means(in name.arch form): foo.i386 and foo.noarch will
- be compared to each other for highest version"""
+ be compared to each other for highest version.
+ Note that given: foo-1.i386; foo-2.i386 and foo-3.x86_64
+ The last _two_ pkgs will be returned, not just one of them. """
raise NotImplementedError()
def simplePkgList(self, patterns=None, ignore_case=False):
@@ -330,7 +332,7 @@ class PackageSackBase(object):
if not po.requires_names:
continue
for r in po.requires_names:
- if not req.has_key(r):
+ if r not in req:
req[r] = set()
if len(req[r]) > 1: # We only need to know if another pkg.
continue # reqs. the provide. So 2 pkgs. is enough.
@@ -507,7 +509,9 @@ class MetaSack(PackageSackBase):
def returnNewestByName(self, name=None, patterns=None, ignore_case=False):
"""return list of newest packages based on name matching
this means(in name.arch form): foo.i386 and foo.noarch will
- be compared to each other for highest version"""
+ be compared to each other for highest version.
+ Note that given: foo-1.i386; foo-2.i386 and foo-3.x86_64
+ The last _two_ pkgs will be returned, not just one of them. """
pkgs = self._computeAggregateListResult("returnNewestByName", name,
patterns, ignore_case)
pkgs = packagesNewestByName(pkgs)
@@ -639,11 +643,10 @@ class PackageSack(PackageSackBase):
def setCompatArchs(self, compatarchs):
self.compatarchs = compatarchs
-
def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
"""return list of pkgobjects matching the nevra requested"""
self._checkIndexes(failure='build')
- if self.nevra.has_key((name, epoch, ver, rel, arch)):
+ if (name, epoch, ver, rel, arch) in self.nevra:
return self.nevra[(name, epoch, ver, rel, arch)]
elif name is not None:
pkgs = self.nevra.get((name, None, None, None, None), [])
@@ -663,6 +666,18 @@ class PackageSack(PackageSackBase):
result.append(po)
return result
+ def searchNames(self, names=[]):
+ """return list of pkgobjects matching the names requested"""
+ self._checkIndexes(failure='build')
+ result = []
+ done = set()
+ for name in names:
+ if name in done:
+ continue
+ done.add(name)
+ result.extend(self.nevra.get((name, None, None, None, None), []))
+ return result
+
def getProvides(self, name, flags=None, version=(None, None, None)):
"""return dict { packages -> list of matching provides }"""
self._checkIndexes(failure='build')
@@ -767,7 +782,7 @@ class PackageSack(PackageSackBase):
dict[key].append(data)
def _delFromListOfDict(self, dict, key, data):
- if not dict.has_key(key):
+ if key not in dict:
return
try:
dict[key].remove(data)
@@ -902,7 +917,7 @@ class PackageSack(PackageSackBase):
highdict[(pkg.name, pkg.arch)] = pkg
if naTup:
- if highdict.has_key(naTup):
+ if naTup in highdict:
return [highdict[naTup]]
else:
raise PackageSackError, 'No Package Matching %s.%s' % naTup
@@ -912,7 +927,10 @@ class PackageSack(PackageSackBase):
def returnNewestByName(self, name=None, patterns=None, ignore_case=False):
"""return list of newest packages based on name matching
this means(in name.arch form): foo.i386 and foo.noarch will
- be compared to each other for highest version"""
+ be compared to each other for highest version.
+ Note that given: foo-1.i386; foo-2.i386 and foo-3.x86_64
+ The last _two_ pkgs will be returned, not just one of them. """
+
highdict = {}
for pkg in self.returnPackages(patterns=patterns,
ignore_case=ignore_case):
@@ -927,7 +945,7 @@ class PackageSack(PackageSackBase):
highdict[pkg.name].append(pkg)
if name:
- if highdict.has_key(name):
+ if name in highdict:
return highdict[name]
else:
raise PackageSackError, 'No Package Matching %s' % name
@@ -975,7 +993,9 @@ class PackageSack(PackageSackBase):
return matches
def packagesNewestByName(pkgs):
- """ Does the same as PackageSack.returnNewestByName() """
+ """ Does the same as PackageSack.returnNewestByName().
+ Note that given: foo-1.i386; foo-2.i386 and foo-3.x86_64
+ The last _two_ pkgs will be returned, not just one of them. """
newest = {}
for pkg in pkgs:
key = pkg.name
diff --git a/yum/packages.py b/yum/packages.py
index bb0e7ca..ba10136 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -38,6 +38,7 @@ from constants import *
import urlparse
urlparse.uses_fragment.append("media")
+from urlgrabber.grabber import URLGrabber, URLGrabError
# For verify
import pwd
@@ -110,7 +111,7 @@ def parsePackages(pkgs, usercommands, casematch=0,
for command in usercommands:
if not casematch:
command = command.lower()
- if pkgdict.has_key(command):
+ if command in pkgdict:
exactmatch.extend(pkgdict[command])
del pkgdict[command]
else:
@@ -223,7 +224,7 @@ class PackageObject(object):
# self.pkgtup = (self.name, self.arch, self.epoch, self.version, self.release)
self._checksums = [] # (type, checksum, id(0,1)
- def __str__(self):
+ def _ui_envra(self):
if self.epoch == '0':
out = '%s-%s-%s.%s' % (self.name,
self.version,
@@ -236,6 +237,25 @@ class PackageObject(object):
self.release,
self.arch)
return out
+ ui_envra = property(fget=lambda self: self._ui_envra())
+
+ def _ui_nevra(self):
+ if self.epoch == '0':
+ out = '%s-%s-%s.%s' % (self.name,
+ self.version,
+ self.release,
+ self.arch)
+ else:
+ out = '%s-%s:%s-%s.%s' % (self.name,
+ self.epoch,
+ self.version,
+ self.release,
+ self.arch)
+ return out
+ ui_nevra = property(fget=lambda self: self._ui_nevra())
+
+ def __str__(self):
+ return self.ui_envra
def verCMP(self, other):
""" Compare package to another one, only rpm-version ordering. """
@@ -368,7 +388,7 @@ class RpmBase(object):
def checkPrco(self, prcotype, prcotuple):
"""returns 1 or 0 if the pkg contains the requested tuple/tuple range"""
# get rid of simple cases - nothing
- if not self.prco.has_key(prcotype):
+ if prcotype not in self.prco:
return 0
# First try and exact match, then search
@@ -410,7 +430,10 @@ class RpmBase(object):
# find the named entry in pkgobj, do the comparsion
result = []
for (n, f, (e, v, r)) in self.returnPrco(prcotype):
- if reqn != n:
+ if isinstance(reqn, unicode) == isinstance(n, unicode):
+ if reqn != n: # stupid python...
+ continue
+ elif misc.to_utf8(reqn) != misc.to_utf8(n):
continue
if f == '=':
@@ -440,11 +463,17 @@ class RpmBase(object):
"""return changelog entries"""
return self._changelog
- def returnFileEntries(self, ftype='file'):
- """return list of files based on type"""
- # fixme - maybe should die - use direct access to attribute
+ def returnFileEntries(self, ftype='file', primary_only=False):
+ """return list of files based on type, you can pass primary_only=True
+ to limit to those files in the primary repodata"""
if self.files:
- if self.files.has_key(ftype):
+ if ftype in self.files:
+ if primary_only:
+ if ftype == 'dir':
+ match = misc.re_primary_dirname
+ else:
+ match = misc.re_primary_filename
+ return [fn for fn in self.files[ftype] if match(fn)]
return self.files[ftype]
return []
@@ -454,11 +483,10 @@ class RpmBase(object):
return self.files.keys()
def returnPrcoNames(self, prcotype):
- results = []
- lists = self.returnPrco(prcotype)
- for (name, flag, vertup) in lists:
- results.append(name)
- return results
+ if not hasattr(self, '_cache_prco_names_' + prcotype):
+ data = [n for (n, f, v) in self.returnPrco(prcotype)]
+ setattr(self, '_cache_prco_names_' + prcotype, data)
+ return getattr(self, '_cache_prco_names_' + prcotype)
def getProvidesNames(self):
warnings.warn('getProvidesNames() will go away in a future version of Yum.\n',
@@ -466,7 +494,10 @@ class RpmBase(object):
return self.provides_names
def simpleFiles(self, ftype='files'):
- if self.files and self.files.has_key(ftype):
+ warnings.warn('simpleFiles() will go away in a future version of Yum.'
+ 'Use returnFileEntries(primary_only=True)\n',
+ Errors.YumDeprecationWarning, stacklevel=2)
+ if self.files and ftype in self.files:
return self.files[ftype]
return []
@@ -488,6 +519,25 @@ class RpmBase(object):
changelog = property(fget=lambda self: self.returnChangelog())
EVR = property(fget=lambda self: self.returnEVR())
+ def _getBaseName(self):
+ """ Return the "base name" of the package, atm. we can only look at
+ the sourcerpm. """
+ if hasattr(self, '_base_package_name_ret'):
+ return self._base_package_name_ret
+
+ if hasattr(self, 'sourcerpm') and self.sourcerpm:
+ (n, v, r, e, a) = rpmUtils.miscutils.splitFilename(self.sourcerpm)
+ if n != self.name:
+ self._base_package_name_ret = n
+ return n
+
+ # If there is no sourcerpm, or sourcerpm == us, use .name
+ self._base_package_name_ret = self.name
+ return self._base_package_name_ret
+
+ base_package_name = property(fget=lambda self: self._getBaseName())
+
+
class PackageEVR:
"""
@@ -555,6 +605,25 @@ class YumAvailablePackage(PackageObject, RpmBase):
self.rel = self.release
self.pkgtup = (self.name, self.arch, self.epoch, self.version, self.release)
+ def _ui_from_repo(self):
+ """ This reports the repo the package is from, we integrate YUMDB info.
+ for RPM packages so a package from "fedora" that is installed has a
+ ui_from_repo of "@fedora". Note that, esp. with the --releasever
+ option, "fedora" or "rawhide" isn't authoritive.
+ So we also check against the current releasever and if it is
+ different we also print the YUMDB releasever. This means that
+ installing from F12 fedora, while running F12, would report as
+ "@fedora/13". """
+ if self.repoid == 'installed' and 'from_repo' in self.yumdb_info:
+ end = ''
+ if (self.rpmdb.releasever is not None and
+ 'releasever' in self.yumdb_info and
+ self.yumdb_info.releasever != self.rpmdb.releasever):
+ end = '/' + self.yumdb_info.releasever
+ return '@' + self.yumdb_info.from_repo + end
+ return self.repoid
+ ui_from_repo = property(fget=lambda self: self._ui_from_repo())
+
def exclude(self):
"""remove self from package sack"""
self.repo.sack.delPackage(self)
@@ -924,27 +993,6 @@ class YumAvailablePackage(PackageObject, RpmBase):
if mylist: msg += " </rpm:%s>" % pcotype
return msg
- def _return_primary_files(self, list_of_files=None):
- returns = {}
- if list_of_files is None:
- list_of_files = self.returnFileEntries('file')
- for item in list_of_files:
- if item is None:
- continue
- if misc.re_primary_filename(item):
- returns[item] = 1
- return returns.keys()
-
- def _return_primary_dirs(self):
- returns = {}
- for item in self.returnFileEntries('dir'):
- if item is None:
- continue
- if misc.re_primary_dirname(item):
- returns[item] = 1
- return returns.keys()
-
-
def _dump_files(self, primary=False):
msg =""
if not primary:
@@ -952,9 +1000,9 @@ class YumAvailablePackage(PackageObject, RpmBase):
dirs = self.returnFileEntries('dir')
ghosts = self.returnFileEntries('ghost')
else:
- files = self._return_primary_files()
- ghosts = self._return_primary_files(list_of_files = self.returnFileEntries('ghost'))
- dirs = self._return_primary_dirs()
+ files = self.returnFileEntries('file', primary_only=True)
+ dirs = self.returnFileEntries('dir', primary_only=True)
+ ghosts = self.returnFileEntries('ghost', primary_only=True)
for fn in files:
msg += """ <file>%s</file>\n""" % misc.to_xml(fn)
@@ -979,6 +1027,14 @@ class YumAvailablePackage(PackageObject, RpmBase):
for (name, flags, (e,v,r),pre) in mylist:
if name.startswith('rpmlib('):
continue
+ # this drops out requires that the pkg provides for itself.
+ if name in self.provides_names or name in self.filelist + \
+ self.dirlist + self.ghostlist:
+ if not flags:
+ continue
+ else:
+ if self.checkPrco('provides', (name, flags, (e,v,r))):
+ continue
prcostring = ''' <rpm:entry name="%s"''' % misc.to_xml(name, attrib=True)
if flags:
prcostring += ''' flags="%s"''' % misc.to_xml(flags, attrib=True)
@@ -1006,7 +1062,15 @@ class YumAvailablePackage(PackageObject, RpmBase):
clogs = self.changelog
else:
clogs = self.changelog[:clog_limit]
+ last_ts = 0
+ hack_ts = 0
for (ts, author, content) in reversed(clogs):
+ if ts != last_ts:
+ hack_ts = 0
+ else:
+ hack_ts += 1
+ last_ts = ts
+ ts += hack_ts
msg += """<changelog author="%s" date="%s">%s</changelog>\n""" % (
misc.to_xml(author, attrib=True), misc.to_xml(str(ts)),
misc.to_xml(content))
@@ -1160,7 +1224,7 @@ class YumHeaderPackage(YumAvailablePackage):
self.files['file'] = []
self.files['file'].append(fn)
continue
- if not self.__mode_cache.has_key(mode):
+ if mode not in self.__mode_cache:
self.__mode_cache[mode] = stat.S_ISDIR(mode)
fkey = 'file'
@@ -1172,10 +1236,10 @@ class YumHeaderPackage(YumAvailablePackage):
self._loadedfiles = True
- def returnFileEntries(self, ftype='file'):
+ def returnFileEntries(self, ftype='file', primary_only=False):
"""return list of files based on type"""
self._loadFiles()
- return YumAvailablePackage.returnFileEntries(self,ftype)
+ return YumAvailablePackage.returnFileEntries(self,ftype,primary_only)
def returnChangelog(self):
# note - if we think it is worth keeping changelogs in memory
@@ -1284,7 +1348,7 @@ class YumInstalledPackage(YumHeaderPackage):
self.yumdb_info = yumdb.get_package(self)
def verify(self, patterns=[], deps=False, script=False,
- fake_problems=True, all=False):
+ fake_problems=True, all=False, fast=False):
"""verify that the installed files match the packaged checksum
optionally verify they match only if they are in the 'pattern' list
returns a tuple """
@@ -1462,11 +1526,15 @@ class YumInstalledPackage(YumHeaderPackage):
prob.disk_value = my_st.st_mode
problems.append(prob)
+ if fast and not problems and (my_st_size == size):
+ vflags &= ~_RPMVERIFY_DIGEST
+
# Note that because we might get the _size_ from prelink,
# we need to do the checksum, even if we just throw it away,
# just so we get the size correct.
if (check_content and
- ((have_prelink and vflags & _RPMVERIFY_FILESIZE) or
+ ((have_prelink and (vflags & _RPMVERIFY_FILESIZE) and
+ (my_st_size != size)) or
(csum and vflags & _RPMVERIFY_DIGEST))):
try:
my_csum = misc.checksum(csum_type, fn)
@@ -1486,13 +1554,15 @@ class YumInstalledPackage(YumHeaderPackage):
# This is how rpm -V works, try and if that fails try
# again with prelink.
p = Popen([prelink_cmd, "-y", fn],
- shell=True, bufsize=-1, stdin=PIPE,
+ bufsize=-1, stdin=PIPE,
stdout=PIPE, stderr=PIPE, close_fds=True)
(ig, fp, er) = (p.stdin, p.stdout, p.stderr)
# er.read(1024 * 1024) # Try and get most of the stderr
fp = _CountedReadFile(fp)
- my_csum = misc.checksum(csum_type, fp)
- my_st_size = fp.read_size
+ tcsum = misc.checksum(csum_type, fp)
+ if fp.read_size: # If prelink worked
+ my_csum = tcsum
+ my_st_size = fp.read_size
if (csum and vflags & _RPMVERIFY_DIGEST and gen_csum and
my_csum != csum):
@@ -1507,7 +1577,7 @@ class YumInstalledPackage(YumHeaderPackage):
my_st_size != size):
prob = _PkgVerifyProb('size', 'size does not match', ftypes)
prob.database_value = size
- prob.disk_value = my_st.st_size
+ prob.disk_value = my_st_size
problems.append(prob)
else:
@@ -1570,7 +1640,6 @@ class YumLocalPackage(YumHeaderPackage):
self.pkgtup = (self.name, self.arch, self.epoch, self.ver, self.rel)
self._hdrstart = None
self._hdrend = None
- self.arch = self.isSrpm()
self.checksum_type = misc._default_checksums[0]
# these can be set by callers that need these features (ex: createrepo)
@@ -1677,3 +1746,42 @@ class YumLocalPackage(YumHeaderPackage):
return msg
+class YumUrlPackage(YumLocalPackage):
+ """Class to handle an arbitrary package from a URL
+ this inherits most things from YumLocalPackage, but will download a
+ remote package to make it local.
+ init takes a YumBase, a ts instance and a url to the package."""
+
+ def __init__(self, yb=None, ts=None, url=None, ua=None):
+ if url.lower().startswith("file:"):
+ result = url[len("file:"):]
+ elif not misc.re_remote_url(url):
+ result = url
+ else:
+ cb = None
+ pd = {}
+ for repo in yb.repos.listEnabled():
+ cb = repo.callback # Hacky, but these are "always" the same
+ if (repo.proxy == yb.conf.proxy and
+ repo.proxy_username == yb.conf.proxy_username and
+ repo.proxy_password == yb.conf.proxy_password):
+ # Even more hacky...
+ pd = repo.proxy_dict
+ break
+ fname = os.path.basename(url)
+ local = misc.getCacheDir()
+ if local is None: # bugger...
+ local = "%s/../" % repo.cachedir
+ local = "%s/%s" % (local, fname)
+ try:
+ ug = URLGrabber(bandwidth = yb.conf.bandwidth,
+ retry = yb.conf.retries,
+ throttle = yb.conf.throttle,
+ progress_obj = cb,
+ proxies=pd)
+ if ua is not None:
+ ug.opts.user_agent = ua
+ result = ug.urlgrab(url, local, text=fname)
+ except URLGrabError, e:
+ raise Errors.MiscError("Cannot download %s: %s" % (url, e))
+ YumLocalPackage.__init__(self, ts, result)
diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 4f0ff7e..f8dccdb 100644
--- a/yum/pgpmsg.py
+++ b/yum/pgpmsg.py
@@ -1,4 +1,4 @@
-##Copyright (C) 2003,2005 Jens B. Jorgensen <jbj1@ultraemail.net>
+##Copyright (C) 2003,2005,2009 Jens B. Jorgensen <jbj1@ultraemail.net>
##
##This program is free software; you can redistribute it and/or
##modify it under the terms of the GNU General Public License
@@ -61,6 +61,9 @@ CTB_PKT_LIT = 11 # 1011 - literal data packet
CTB_PKT_TRUST = 12 # 1100 - trust packet
CTB_PKT_USER_ID = 13 # 1101 - user id packet
CTB_PKT_PK_SUB = 14 # 1110 - public subkey packet
+CTB_PKT_USER_ATTR = 17 # 10001 - user attribute packet
+CTB_PKT_SYM_ENC_INT = 18 # 10010 - symmetric encrypted integrity packet
+CTB_PKT_MOD_DETECT = 19 # 10011 - modification detection code packet
ctb_pkt_to_str = {
CTB_PKT_PK_ENC : 'public-key encrypted session packet',
@@ -76,7 +79,10 @@ ctb_pkt_to_str = {
CTB_PKT_LIT : 'literal data packet',
CTB_PKT_TRUST : 'trust packet',
CTB_PKT_USER_ID : 'user id packet',
- CTB_PKT_PK_SUB : 'public subkey packet'
+ CTB_PKT_PK_SUB : 'public subkey packet',
+ CTB_PKT_USER_ATTR : 'user attribute packet',
+ CTB_PKT_SYM_ENC_INT : 'symmetric encrypted integrity packet',
+ CTB_PKT_MOD_DETECT : 'modification detection code packet'
}
@@ -124,6 +130,7 @@ ALGO_SK_DES_SK = 6 # DES/SK
ALGO_SK_AES_128 = 7 # AES 128-bit
ALGO_SK_AES_192 = 8 # AES 192-bit
ALGO_SK_AES_256 = 9 # AES 256-bit
+ALGO_SK_TWOFISH_256 = 10 # Twofish 256
algo_sk_to_str = {
ALGO_SK_PLAIN : 'Plaintext or unencrypted data',
@@ -135,18 +142,21 @@ algo_sk_to_str = {
ALGO_SK_DES_SK : 'DES/SK',
ALGO_SK_AES_128 : 'AES 128-bit',
ALGO_SK_AES_192 : 'AES 192-bit',
- ALGO_SK_AES_256 : 'AES 256-bit'
+ ALGO_SK_AES_256 : 'AES 256-bit',
+ ALGO_SK_TWOFISH_256 : 'Twofish 256-bit'
}
# Compression Algorithms
ALGO_COMP_UNCOMP = 0 # Uncompressed
-ALGO_COMP_ZIP = 1 # ZIP
-ALGO_COMP_ZLIB = 2 # ZLIB
+ALGO_COMP_ZIP = 1 # ZIP
+ALGO_COMP_ZLIB = 2 # ZLIB
+ALGO_COMP_BZIP2 = 3 # BZip2
algo_comp_to_str = {
ALGO_COMP_UNCOMP : 'Uncompressed',
ALGO_COMP_ZIP : 'ZIP',
- ALGO_COMP_ZLIB : 'ZLIB'
+ ALGO_COMP_ZLIB : 'ZLIB',
+ ALGO_COMP_BZIP2 : 'BZip2'
}
# Hash Algorithms
@@ -157,6 +167,10 @@ ALGO_HASH_SHA_DBL = 4 # double-width SHA
ALGO_HASH_MD2 = 5 # MD2
ALGO_HASH_TIGER192 = 6 # TIGER192
ALGO_HASH_HAVAL_5_160 = 7 # HAVAL-5-160
+ALGO_HASH_SHA256 = 8 # SHA256
+ALGO_HASH_SHA384 = 9 # SHA384
+ALGO_HASH_SHA512 = 10 # SHA512
+ALGO_HASH_SHA224 = 11 # SHA224
algo_hash_to_str = {
ALGO_HASH_MD5 : 'MD5',
@@ -165,7 +179,11 @@ algo_hash_to_str = {
ALGO_HASH_SHA_DBL : 'double-width SHA',
ALGO_HASH_MD2 : 'MD2',
ALGO_HASH_TIGER192 : 'TIGER192',
- ALGO_HASH_HAVAL_5_160 : 'HAVAL-5-160'
+ ALGO_HASH_HAVAL_5_160 : 'HAVAL-5-160',
+ ALGO_HASH_SHA256 : 'SHA256',
+ ALGO_HASH_SHA384 : 'SHA384',
+ ALGO_HASH_SHA512 : 'SHA512',
+ ALGO_HASH_SHA224 : 'SHA224'
}
# Signature types
@@ -217,10 +235,13 @@ SIG_SUB_TYPE_PREF_COMP_ALGO = 22 # preferred compression algorithms
SIG_SUB_TYPE_KEY_SRV_PREF = 23 # key server preferences
SIG_SUB_TYPE_PREF_KEY_SRVR = 24 # preferred key server
SIG_SUB_TYPE_PRIM_USER_ID = 25 # primary user id
-SIG_SUB_TYPE_POLICY_URL = 26 # policy URL
+SIG_SUB_TYPE_POLICY_URI = 26 # policy URI
SIG_SUB_TYPE_KEY_FLAGS = 27 # key flags
SIG_SUB_TYPE_SGNR_USER_ID = 28 # signer's user id
SIG_SUB_TYPE_REVOKE_REASON = 29 # reason for revocation
+SIG_SUB_TYPE_FEATURES = 30 # features
+SIG_SUB_TYPE_SIG_TARGET = 31 # signature target
+SIG_SUB_TYPE_EMBEDDED_SIG = 32 # embedded signature
sig_sub_type_to_str = {
SIG_SUB_TYPE_CREATE_TIME : 'signature creation time',
@@ -240,10 +261,13 @@ sig_sub_type_to_str = {
SIG_SUB_TYPE_KEY_SRV_PREF : 'key server preferences',
SIG_SUB_TYPE_PREF_KEY_SRVR : 'preferred key server',
SIG_SUB_TYPE_PRIM_USER_ID : 'primary user id',
- SIG_SUB_TYPE_POLICY_URL : 'policy URL',
+ SIG_SUB_TYPE_POLICY_URI : 'policy URI',
SIG_SUB_TYPE_KEY_FLAGS : 'key flags',
SIG_SUB_TYPE_SGNR_USER_ID : "signer's user id",
- SIG_SUB_TYPE_REVOKE_REASON : 'reason for revocation'
+ SIG_SUB_TYPE_REVOKE_REASON : 'reason for revocation',
+ SIG_SUB_TYPE_FEATURES : 'features',
+ SIG_SUB_TYPE_SIG_TARGET : 'signature target',
+ SIG_SUB_TYPE_EMBEDDED_SIG : 'embedded signature'
}
# in a signature subpacket there may be a revocation reason, these codes indicate
@@ -274,6 +298,13 @@ KEY_FLAGS1_GROUP = 0x80 # Private component may be among group
REVOKE_KEY_CLASS_MAND = 0x80 # this bit must always be set
REVOKE_KEY_CLASS_SENS = 0x40 # sensitive
+# Features may be indicated in a signature hashed subpacket
+PGP_FEATURE_1_MOD_DETECT = 0x01 # Modification detection
+
+pgp_feature_to_str = {
+ PGP_FEATURE_1_MOD_DETECT : 'Modification Detectiobn'
+}
+
def get_whole_number(msg, idx, numlen) :
"""get_whole_number(msg, idx, numlen)
extracts a "whole number" field of length numlen from msg at index idx
@@ -374,7 +405,7 @@ def map_to_str(m, vals) :
slist.append('unknown(' + str(i) + ')')
return ', '.join(slist)
-class pgp_packet :
+class pgp_packet(object) :
def __init__(self) :
self.pkt_typ = None
@@ -506,6 +537,20 @@ class user_id(pgp_packet) :
def __str__(self) :
return pgp_packet.__str__(self) + "\n" + "id: " + self.id + "\n"
+class user_attribute(pgp_packet) :
+ def __init__(self) :
+ pgp_packet.__init__(self)
+ self.sub_type = None
+ self.data = None
+
+ def deserialize(self, msg, idx, pkt_len) :
+ self.sub_type, idx = get_whole_int(msg, idx, 1)
+ pkt_len = pkt_len - 1
+ self.data = msg[idx:idx + pkt_len]
+
+ def __str__(self) :
+ return pgp_packet.__str__(self) + "\n" + "sub_type: " + str(self.sub_type) + "\ndata: " + str_to_hex(self.data)
+
class signature(pgp_packet) :
def __init__(self) :
pgp_packet.__init__(self)
@@ -527,6 +572,13 @@ class signature(pgp_packet) :
return i[1]
return None
+ def creation_time(self) :
+ if self.version == 3 :
+ return self.timestamp
+ else :
+ i = self.get_hashed_subpak(SIG_SUB_TYPE_CREATE_TIME)
+ return i[1]
+
def expiration(self) :
if self.version != 4 :
raise ValueError('v3 signatures don\'t have expirations')
@@ -568,7 +620,7 @@ class signature(pgp_packet) :
idx = idx + sublen - 1
return (subtype, expr), idx
if subtype == SIG_SUB_TYPE_PREF_SYMM_ALGO or subtype == SIG_SUB_TYPE_PREF_HASH_ALGO or subtype == SIG_SUB_TYPE_PREF_COMP_ALGO or subtype == SIG_SUB_TYPE_KEY_FLAGS :
- algo_list = map(ord, list(msg[idx:idx+sublen-1]))
+ algo_list = map(lambda x : ord(x), list(msg[idx:idx+sublen-1]))
idx = idx + sublen - 1
return (subtype, algo_list), idx
if subtype == SIG_SUB_TYPE_REVOKE_KEY : # revocation key
@@ -604,10 +656,10 @@ class signature(pgp_packet) :
if subtype == SIG_SUB_TYPE_PRIM_USER_ID : # primary user id
bool, idx = get_whole_int(msg, idx, 1)
return (subtype, bool), idx
- if subtype == SIG_SUB_TYPE_POLICY_URL : # policy URL
- url = msg[idx:idx+sublen-1]
+ if subtype == SIG_SUB_TYPE_POLICY_URI : # policy URI
+ uri = msg[idx:idx+sublen-1]
idx = idx + sublen - 1
- return (subtype, url), idx
+ return (subtype, uri), idx
if subtype == SIG_SUB_TYPE_SGNR_USER_ID : # signer's user id
signer_id = msg[idx:idx+sublen-1]
idx = idx + sublen - 1
@@ -618,6 +670,26 @@ class signature(pgp_packet) :
reas = msg[idx:idx+reas_len]
idx = idx + reas_len
return (subtype, rev_code, reas), idx
+ if subtype == SIG_SUB_TYPE_FEATURES : # features
+ sublen = sublen - 1
+ l = [subtype]
+ while sublen > 0 :
+ oct, idx = get_whole_int(msg, idx, 1)
+ l.append(oct)
+ sublen = sublen - 1
+ return tuple(l), idx
+ if subtype == SIG_SUB_TYPE_SIG_TARGET : # signature target
+ public_key_algo, idx = get_whole_int(msg, idx, 1)
+ hash_algo, idx = get_whole_int(msg, idx, 1)
+ hash = msg[idx:idx+sublen-3]
+ idx = idx + sublen - 3
+ return (subtype, public_key_algo, hash_algo, hash), idx
+ if subtype == SIG_SUB_TYPE_EMBEDDED_SIG : # embedded signature
+ # don't do anything fancy, just the raw bits
+ dat = msg[idx:idx+sublen-1]
+ idx = idx + sublen - 1
+ return (subtype, dat), idx
+
# otherwise the subpacket is an unknown type, so we just pack the data in it
dat = msg[idx:idx+sublen-1]
idx = idx + sublen - 1
@@ -686,7 +758,7 @@ class signature(pgp_packet) :
return 'is primary user id'
else :
return 'is not primary user id'
- if sp[0] == SIG_SUB_TYPE_POLICY_URL : # policy URL
+ if sp[0] == SIG_SUB_TYPE_POLICY_URI : # policy URL
return 'policy url: %s' % sp[1]
if sp[0] == SIG_SUB_TYPE_KEY_FLAGS : # key flags
flags = []
@@ -713,6 +785,18 @@ class signature(pgp_packet) :
if revoke_reason_to_str.has_key(sp[1]) :
reas = revoke_reason_to_str[sp[1]]
return 'reason for revocation: %s, %s' % (reas, sp[2])
+ if sp[0] == SIG_SUB_TYPE_FEATURES : # featues
+ features = []
+ if len(sp) > 1 :
+ val = sp[1]
+ if val & PGP_FEATURE_1_MOD_DETECT :
+ features.append('Modification Detection')
+ val = val & ~PGP_FEATURE_1_MOD_DETECT
+ if val != 0 :
+ features.append('[0]=0x%x' % val)
+ for i in range(2, len(sp)) :
+ features.append('[%d]=0x%x' % (i-1,sp[i]))
+ return 'features: ' + ', '.join(features)
# this means we don't know what the thing is so we just have raw data
return 'unknown(%d): %s' % (sp[0], str_to_hex(sp[1]))
@@ -792,27 +876,33 @@ class pgp_certificate(object):
def __init__(self) :
self.version = None
self.public_key = None
- self.revocation = None
- #self.user_id = None
+ self.revocations = []
self.user_ids = []
- self.rvkd_user_ids = []
+ self.primary_user_id = -1 # index of the primary user id
def __str__(self) :
sio = cStringIO.StringIO()
sio.write("PGP Public Key Certificate v%d\n" % self.version)
+ sio.write("Cert ID: %s\n" % str_to_hex(self.public_key.key_id()))
sio.write("Primary ID: %s\n" % self.user_id)
sio.write(str(self.public_key))
for uid in self.user_ids :
sio.write(str(uid[0]))
for sig in uid[1:] :
sio.write(" " + str(sig))
+ if hasattr(self, 'user_attrs') :
+ for uattr in self.user_attrs :
+ sio.write(' ')
+ sio.write(str(uattr[0]))
+ for sig in uattr[1:] :
+ sio.write(" " + str(sig))
return sio.getvalue()
def get_user_id(self):
# take the LAST one in the list, not first
# they appear to be ordered FIFO from the key and that means if you
# added a key later then it won't show the one you expect
- return self.user_ids[-1][0].id
+ return self.user_ids[self.primary_user_id][0].id
user_id = property(get_user_id)
@@ -856,8 +946,8 @@ be scanned to make sure they are valid for a pgp certificate."""
if self.version == 3 :
pkt_idx = 1
- # second packet could be a revocation
- if pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
+ # zero or more revocations
+ while pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
if pkts[pkt_idx].version != 3 :
raise ValueError('version 3 cert has version %d signature' % pkts[pkt_idx].version)
if pkts[pkt_idx].sig_type != SIG_TYPE_KEY_REVOKE :
@@ -865,7 +955,7 @@ be scanned to make sure they are valid for a pgp certificate."""
# ok, well at least the type is good, we'll assume the cert is
# revoked
- self.revocation = pkts[pkt_idx]
+ self.revocations.append(pkts[pkt_idx])
# increment the pkt_idx to go to the next one
pkt_idx = pkt_idx + 1
@@ -874,7 +964,10 @@ be scanned to make sure they are valid for a pgp certificate."""
while pkt_idx < len(pkts) :
# this packet is supposed to be a user id
if pkts[pkt_idx].pkt_typ != CTB_PKT_USER_ID :
- raise ValueError('pgp packet %d is not user id, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))
+ if len(self.user_ids) == 0 :
+ raise ValueError('pgp packet %d is not user id, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))
+ else :
+ break
user_id = [pkts[pkt_idx]]
pkt_idx = pkt_idx + 1
@@ -887,60 +980,43 @@ be scanned to make sure they are valid for a pgp certificate."""
if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
- if pkts[pkt_idx].version != 3 :
- raise ValueError('version 3 cert has version %d signature' % pkts[pkt_idx].version)
-
user_id.append(pkts[pkt_idx])
- # was the a revocation?
- if pkts[pkt_idx].sig_type == SIG_TYPE_CERT_REVOKE :
- is_revoked = 1
-
- # is this a primary user id?
- if not self.cert_id and pkts[pkt_idx].sig_type == SIG_TYPE_PK_USER_GEN :
- is_primary_user_id = pkt_idx
pkt_idx = pkt_idx + 1
- # we get the cert id from the first sig that's a candidate for being
- # the primary user id
- if not self.cert_id and is_primary_user_id and not is_revoked :
- # the cert type must be generic pubkey and user id
- self.user_id = user_id[0].id
-
# append the user ID and signature(s) onto a list
- if is_revoked :
- self.rvkd_user_ids.append(user_id)
- else :
- self.user_ids.append(user_id)
+ self.user_ids.append(user_id)
else : # self.version == 4
pkt_idx = 1
self.direct_key_sigs = []
self.subkeys = []
self.rvkd_subkeys = []
+ self.user_attrs = []
+
+ cert_id = self.public_key.key_id()
# second packet could be a revocation (or a direct key self signature)
- if pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
+ while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
if pkts[pkt_idx].version != 4 :
raise ValueError('version 4 cert has version %d signature' % pkts[pkt_idx].version)
if pkts[pkt_idx].sig_type == SIG_TYPE_KEY_REVOKE :
- # ok, well at least the type is good, we'll assume the cert is
- # revoked
- self.revocation = pkts[pkt_idx]
-
- # increment the pkt_idx to go to the next one
- pkt_idx = pkt_idx + 1
+ self.revocations.append(pkts[pkt_idx])
+ elif pkts[pkt_idx].sig_type == SIG_TYPE_KEY :
+ self.direct_key_sigs.append(pkts[pkt_idx])
+ else :
+ raise ValueError('v4 cert signature has type %s, supposed to be revocation signature or direct key signature' % map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type))
- # there can then be a sequence of direct key signatures
- while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
- if pkts[pkt_idx].sig_type != SIG_TYPE_KEY :
- raise ValueError('v4 cert signature has type %s, supposed to be direct key' % map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type))
- self.direct_key_sigs.append(pkts[pkt_idx])
+ # increment the pkt_idx to go to the next one
pkt_idx = pkt_idx + 1
- # the following packets are User ID, Signature... sets or subkey, signature... sets
+ # the following packets are:
+ # User ID, signature... sets or
+ # subkey, signature... sets or
+ # user attribute, signature... sets
+ prim_user_id_sig_time = 0
+
while pkt_idx < len(pkts) :
-
# this packet is supposed to be a user id
if pkts[pkt_idx].pkt_typ == CTB_PKT_USER_ID :
user_id = [pkts[pkt_idx]]
@@ -953,41 +1029,59 @@ be scanned to make sure they are valid for a pgp certificate."""
# bind it to the key
while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
- raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
+ raise ValueError('signature %d doesn\'t bind user_id to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type)))
user_id.append(pkts[pkt_idx])
- # was the a revocation?
- if pkts[pkt_idx].sig_type == SIG_TYPE_CERT_REVOKE :
- is_revoked = 1
-
# is this the primary user id?
- if pkts[pkt_idx].version == 4 and pkts[pkt_idx].is_primary_user_id() :
- is_primary_user_id = 1
+ if pkts[pkt_idx].key_id() == cert_id :
+ if pkts[pkt_idx].is_primary_user_id() :
+ ct = pkts[pkt_idx].creation_time()
+ if ct > prim_user_id_sig_time :
+ self.primary_user_id = len(self.user_ids)
+ prim_user_id_sig_time = ct
+
pkt_idx = pkt_idx + 1
# append the user ID and signature(s) onto the list
- if is_revoked :
- self.rvkd_user_ids.append(user_id)
- else :
- self.user_ids.append(user_id)
+ self.user_ids.append(user_id)
- elif pkts[pkt_idx].pkt_typ == CTB_PKT_PK_SUB :
- # collect this list of subkey + signatures
- subkey = [pkts[pkt_idx]]
- pkt_idx = pkt_idx + 1
+ # this packet is supposed to be a user id
+ elif pkts[pkt_idx].pkt_typ == CTB_PKT_USER_ATTR :
+ user_attr = [pkts[pkt_idx]]
is_revoked = 0
+ pkt_idx = pkt_idx + 1
+
# there may be a sequence of signatures following the user id which
# bind it to the key
while pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG :
- if pkts[pkt_idx].sig_type not in (SIG_TYPE_SUBKEY_BIND, SIG_TYPE_SUBKEY_REVOKE) :
- raise ValueError('signature %d doesn\'t bind subkey to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
- subkey.append(pkts[pkt_idx])
+ if pkts[pkt_idx].sig_type not in (SIG_TYPE_PK_USER_GEN, SIG_TYPE_PK_USER_PER, SIG_TYPE_PK_USER_CAS, SIG_TYPE_PK_USER_POS, SIG_TYPE_CERT_REVOKE) :
+ raise ValueError('signature %d doesn\'t bind user_attr to key, is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_type)))
+ user_attr.append(pkts[pkt_idx])
+ pkt_idx = pkt_idx + 1
+
+ # append the user ID and signature(s) onto the list
+ self.user_attrs.append(user_attr)
+
+ elif pkts[pkt_idx].pkt_typ == CTB_PKT_PK_SUB :
+ # collect this list of subkey + signature [ + revocation ]
+ subkey = [pkts[pkt_idx]]
+ pkt_idx = pkt_idx + 1
+ is_revoked = 0
- # was this a revocation?
- if pkts[pkt_idx].sig_type == SIG_TYPE_SUBKEY_REVOKE :
- is_revoked = 1
+ # there must be one signature following the subkey that binds it to the main key
+ if pkt_idx >= len(pkts) :
+ raise ValueError('subkey at index %d was not followed by a signature' % (pkt_idx-1))
+ if pkts[pkt_idx].pkt_typ != CTB_PKT_SIG or pkts[pkt_idx].sig_type != SIG_TYPE_SUBKEY_BIND :
+ raise ValueError('signature %d doesn\'t bind subkey to key, type is %s' % (pkt_idx, map_to_str(sig_type_to_str, pkts[pkt_idx].sig_typ)))
+ subkey.append(pkts[pkt_idx])
+
+ pkt_idx = pkt_idx + 1
+ # there may optionally be a revocation
+ if pkt_idx < len(pkts) and pkts[pkt_idx].pkt_typ == CTB_PKT_SIG and pkts[pkt_idx].sig_type == SIG_TYPE_SUBKEY_REVOKE :
+ is_revoked = 1
+ subkey.append(pkts[pkt_idx])
pkt_idx = pkt_idx + 1
# append the user ID and signature(s) onto the list
@@ -996,14 +1090,14 @@ be scanned to make sure they are valid for a pgp certificate."""
else :
self.subkeys.append(subkey)
else :
- raise ValueError('pgp packet %d is not user id or subkey, is %s' % (pkt_idx, map_to_str(ctb_pkt_to_str, pkts[pkt_idx].pkt_typ)))
+ break
# did we get all the things we needed?
#if not self.user_id :
# just take the first valid user id we encountered then
if len(self.user_ids) == 0 :
- raise ValueError('no user id packet was present in the cert')
-
+ raise ValueError('no user id packet was present in the cert %s' % str_to_hex(self.public_key.key_id()))
+ return pkt_idx
def get_ctb(msg, idx) :
@@ -1073,13 +1167,16 @@ def decode(msg) :
elif pkt_typ == CTB_PKT_SIG :
pkt = signature()
+ elif pkt_typ == CTB_PKT_USER_ATTR :
+ pkt = user_attribute()
+
if pkt :
pkt.pkt_typ = pkt_typ
pkt.deserialize(msg, idx, pkt_len)
if debug :
debug.write(pkt.__str__() + "\n")
else :
- raise RuntimeError('unknown pgp packet type %d at %d' % (pkt_typ, idx))
+ raise ValueError('unexpected pgp packet type %s at %d' % (map_to_str(ctb_pkt_to_str, pkt_typ), idx))
pkt_list.append(pkt)
@@ -1087,6 +1184,14 @@ def decode(msg) :
return pkt_list
def decode_msg(msg) :
+ """decode_msg(msg) ==> list of OpenPGP "packet" objects
+Takes an ascii-armored PGP block and returns a list of objects each of which
+corresponds to a PGP "packets".
+
+A PGP message is a series of packets. You need to understand how packets are
+to be combined together in order to know what to do with them. For example
+a PGP "certificate" includes a public key, user id(s), and signature.
+"""
# first we'll break the block up into lines and trim each line of any
# carriage return chars
pgpkey_lines = map(lambda x : x.rstrip(), msg.split('\n'))
@@ -1127,16 +1232,19 @@ def decode_msg(msg) :
pkt_list = decode(cert_msg)
# turn it into a real cert
- cert = pgp_certificate()
- cert.load(pkt_list)
- cert.raw_key = msg
- return cert
+ cert_list = []
+ while len(pkt_list) > 0 :
+ cert = pgp_certificate()
+ cert.raw_key = msg
+ pkt_idx = cert.load(pkt_list)
+ cert_list.append(cert)
+ pkt_list[0:pkt_idx] = []
+ return cert_list
# add the data to our buffer then
block_buf.write(l)
- return None
-
+ return []
def decode_multiple_keys(msg):
#ditto of above - but handling multiple certs/keys per file
@@ -1155,10 +1263,15 @@ def decode_multiple_keys(msg):
block += '%s\n' % l
if l == '-----END PGP PUBLIC KEY BLOCK-----':
in_block = 0
- cert = decode_msg(block)
- if cert:
- certs.append(cert)
+ thesecerts = decode_msg(block)
+ if thesecerts:
+ certs.extend(thesecerts)
block = ''
continue
-
return certs
+
+
+if __name__ == '__main__' :
+ import sys
+ for pgp_cert in decode_msg(open(sys.argv[1]).read()) :
+ print pgp_cert
diff --git a/yum/pkgtag_db.py b/yum/pkgtag_db.py
new file mode 100644
index 0000000..eddf175
--- /dev/null
+++ b/yum/pkgtag_db.py
@@ -0,0 +1,136 @@
+#!/usr/bin/python -tt
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright 2009 Red Hat, Inc
+# written by seth vidal
+
+# parse sqlite tag database
+# return pkgnames and tag that was matched
+import sqlite3 as sqlite
+from sqlutils import executeSQL
+from Errors import PkgTagsError
+import sqlutils
+import sys
+import misc
+
+def catchSqliteException(func):
+ """This decorator converts sqlite exceptions into PkgTagsError"""
+ def newFunc(*args, **kwargs):
+ try:
+ return func(*args, **kwargs)
+ except sqlutils.sqlite.Error, e:
+ # 2.4.x requires this, but 2.6.x complains about even hasattr()
+ # of e.message ... *sigh*
+ if sys.hexversion < 0x02050000:
+ if hasattr(e,'message'):
+ raise PkgTagsError, str(e.message)
+ else:
+ raise PkgTagsError, str(e)
+ raise PkgTagsError, str(e)
+
+ newFunc.__name__ = func.__name__
+ newFunc.__doc__ = func.__doc__
+ newFunc.__dict__.update(func.__dict__)
+ return newFunc
+
+
+
+class PackageTagDB(object):
+ def __init__(self, repoid, sqlite_file):
+ self.sqlite_file = sqlite_file
+ self.repoid = repoid
+ # take a path to the sqlite tag db
+ # open it and leave a cursor in place for the db
+ self._conn = sqlite.connect(sqlite_file)
+ self.cur = self._conn.cursor()
+ self.count = self._sql_exec("select count(*) from packagetags",)
+
+
+ @catchSqliteException
+ def _sql_exec(self, sql, *args):
+ """ Exec SQL against an MD of the repo, return a cursor. """
+
+ executeSQL(self.cur, sql, *args)
+ return self.cur
+
+ def search_tags(self, tag):
+ """Search by tag name/glob
+ Return dict of dict[packagename] = [stringmatched, stringmatched, ...]"""
+ res = {}
+ tag = '%%%s%%' % tag
+ query = "SELECT name, tag, score FROM packagetags where tag like ?"
+ rows = self._sql_exec(query, (tag,))
+ for (name, tag, score) in rows:
+ if name not in res:
+ res[name] = []
+ res[name].append(tag)
+
+ return res
+
+ def search_names(self, name):
+ """Search by package name/glob.
+ Return dict of dict[packagename] = [tag1, tag2, tag3, tag4, ...]"""
+ res = {}
+ name = '%%%s%%' % name
+ query = "SELECT name, tag, score FROM packagetags where name like ?"
+ rows = self._sql_exec(query, (name,))
+ for (name, tag, score) in rows:
+ if name not in res:
+ res[name] = []
+ res[name].append(tag)
+
+ return res
+
+class PackageTags(object):
+ def __init__(self):
+ self.db_objs = {}
+
+ def add(self, repoid, sqlite_file):
+ if repoid in self.db_objs:
+ raise PkgTagsError, "Already added tags from %s" % repoid
+
+ dbobj = PackageTagDB(repoid, sqlite_file)
+ self.db_objs[repoid] = dbobj
+
+ def remove(self, repoid):
+ if repoid in self.db_objs:
+ del self.db_objs[repoid]
+ else:
+ raise PkgTagsError, "No tag db for %s" % repoid
+
+ def search_names(self, name):
+ res = {}
+ for ptd in self.db_objs.values():
+ for (name, taglist) in ptd.search_names(name).items():
+ if not name in res:
+ res[name] = []
+ res[name].extend(taglist)
+
+ out = {}
+ for (name, taglist) in res.items():
+ out[name] = misc.unique(taglist)
+ return out
+
+ def search_tags(self, tagname):
+ res = {}
+ for ptd in self.db_objs.values():
+ for (name, taglist) in ptd.search_tags(tagname).items():
+ if not name in res:
+ res[name] = []
+ res[name].extend(taglist)
+ out = {}
+ for (name, taglist) in res.items():
+ out[name] = misc.unique(taglist)
+ return out
+
diff --git a/yum/plugins.py b/yum/plugins.py
index 02f0d57..9968614 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -310,7 +310,7 @@ class YumPlugins:
modname)
# Store the plugin module and its configuration file
- if not self._plugins.has_key(modname):
+ if modname not in self._plugins:
self._plugins[modname] = (module, conf)
else:
raise Errors.ConfigError(_('Two or more plugins with the name "%s" ' \
diff --git a/yum/repoMDObject.py b/yum/repoMDObject.py
index 06ad82a..0021d94 100755
--- a/yum/repoMDObject.py
+++ b/yum/repoMDObject.py
@@ -94,9 +94,10 @@ class RepoMD:
else:
# srcfile is a file object
infile = srcfile
-
- infile = AutoFileChecksums(infile, ['md5', 'sha1', 'sha256'],
- ignore_missing=True)
+
+ # We trust any of these to mean the repomd.xml is valid.
+ infile = AutoFileChecksums(infile, ['sha256', 'sha512'],
+ ignore_missing=True, ignore_none=True)
parser = iterparse(infile)
try:
@@ -134,7 +135,7 @@ class RepoMD:
return self.repoData.keys()
def getData(self, type):
- if self.repoData.has_key(type):
+ if type in self.repoData:
return self.repoData[type]
else:
raise RepoMDError, "requested datatype %s not available" % type
diff --git a/yum/repos.py b/yum/repos.py
index 7d35612..cd477ba 100644
--- a/yum/repos.py
+++ b/yum/repos.py
@@ -93,7 +93,7 @@ class RepoStorage:
repo.close()
def add(self, repoobj):
- if self.repos.has_key(repoobj.id):
+ if repoobj.id in self.repos:
raise Errors.DuplicateRepoError, 'Repository %s is listed more than once in the configuration' % (repoobj.id)
self.repos[repoobj.id] = repoobj
if hasattr(repoobj, 'quick_enable_disable'):
@@ -205,7 +205,8 @@ class RepoStorage:
def setCacheDir(self, cachedir):
"""sets the cachedir value in all repos"""
-
+
+ self._cachedir = cachedir
for repo in self.repos.values():
repo.old_base_cache_dir = repo.basecachedir
repo.basecachedir = cachedir
@@ -274,8 +275,15 @@ class RepoStorage:
for repo in myrepos:
sack = repo.getPackageSack()
- sack.populate(repo, mdtype, callback, cacheonly)
- self.pkgSack.addSack(repo.id, sack)
+ try:
+ sack.populate(repo, mdtype, callback, cacheonly)
+ except Errors.RepoError, e:
+ if mdtype in ['all', 'metadata'] and repo.skip_if_unavailable:
+ self.disableRepo(repo.id)
+ else:
+ raise
+ else:
+ self.pkgSack.addSack(repo.id, sack)
class Repository:
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 93e14ec..b45f315 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -21,6 +21,7 @@ import os
import os.path
from rpmUtils import miscutils
+from rpmUtils import arch
from rpmUtils.transaction import initReadOnlyTransaction
import misc
import Errors
@@ -31,9 +32,11 @@ from packageSack import PackageSackBase, PackageSackVersion
import fnmatch
import re
-from yum.i18n import to_unicode
+from yum.i18n import to_unicode, _
import constants
+import yum.depsolve
+
class RPMInstalledPackage(YumInstalledPackage):
def __init__(self, rpmhdr, index, rpmdb):
@@ -77,6 +80,40 @@ class RPMInstalledPackage(YumInstalledPackage):
return val
+class RPMDBProblem:
+ '''
+ Represents a problem in the rpmdb, from the check_*() functions.
+ '''
+ def __init__(self, pkg, problem, **kwargs):
+ self.pkg = pkg
+ self.problem = problem
+ for kwarg in kwargs:
+ setattr(self, kwarg, kwargs[kwarg])
+
+ def __cmp__(self, other):
+ if other is None:
+ return 1
+ return cmp(self.pkg, other.pkg) or cmp(self.problem, other.problem)
+
+
+class RPMDBProblemDependency(RPMDBProblem):
+ def __str__(self):
+ if self.problem == 'requires':
+ return "%s %s %s" % (self.pkg, _('has missing requires of'),
+ self.missing)
+
+ return "%s %s %s: %s" % (self.pkg, _('has installed conflicts'),
+ self.found,', '.join(map(str, self.conflicts)))
+
+
+class RPMDBProblemDuplicate(RPMDBProblem):
+ def __init__(self, pkg, **kwargs):
+ RPMDBProblem.__init__(self, pkg, "duplicate", **kwargs)
+
+ def __str__(self):
+ return _("%s is a duplicate with %s") % (self.pkg, self.duplicate)
+
+
class RPMDBPackageSack(PackageSackBase):
'''
Represent rpmdb as a packagesack
@@ -97,7 +134,11 @@ class RPMDBPackageSack(PackageSackBase):
rpm.RPMTAG_OBSOLETEFLAGS)
}
- def __init__(self, root='/'):
+ # Do we want to cache rpmdb data in a file, for later use?
+ __cache_rpmdb__ = True
+
+ def __init__(self, root='/', releasever=None, cachedir=None,
+ persistdir='/var/lib/yum'):
self.root = root
self._idx2pkg = {}
self._name2pkg = {}
@@ -106,7 +147,17 @@ class RPMDBPackageSack(PackageSackBase):
self._simple_pkgtup_list = []
self._get_pro_cache = {}
self._get_req_cache = {}
+ self._loaded_gpg_keys = False
+ if cachedir is None:
+ cachedir = misc.getCacheDir()
+ self.setCacheDir(cachedir)
+ self._persistdir = root + '/' + persistdir
+ self._have_cached_rpmdbv_data = None
+ self._cached_conflicts_data = None
+ # Store the result of what happens, if a transaction completes.
+ self._trans_cache_store = {}
self.ts = None
+ self.releasever = releasever
self.auto_close = False # this forces a self.ts.close() after
# most operations so it doesn't leave
# any lingering locks.
@@ -118,7 +169,7 @@ class RPMDBPackageSack(PackageSackBase):
'obsoletes' : { },
}
- addldb_path = os.path.normpath(root + '/' + '/var/lib/yum/yumdb')
+ addldb_path = os.path.normpath(self._persistdir + '/yumdb')
self.yumdb = RPMDBAdditionalData(db_path=addldb_path)
def _get_pkglist(self):
@@ -151,6 +202,13 @@ class RPMDBPackageSack(PackageSackBase):
'conflicts' : { },
'obsoletes' : { },
}
+ self._have_cached_rpmdbv_data = None
+ self._cached_conflicts_data = None
+
+ def setCacheDir(self, cachedir):
+ """ Sets the internal cachedir value for the rpmdb, to be the
+ "installed" directory from this parent. """
+ self._cachedir = self.root + '/' + cachedir + "/installed/"
def readOnlyTS(self):
if not self.ts:
@@ -180,6 +238,8 @@ class RPMDBPackageSack(PackageSackBase):
mi = ts.dbMatch()
mi.pattern(tag, rpm.RPMMIRE_GLOB, name)
for hdr in mi:
+ if hdr['name'] == 'gpg-pubkey':
+ continue
pkg = self._makePackageObject(hdr, mi.instance())
if not result.has_key(pkg.pkgid):
result[pkg.pkgid] = pkg
@@ -203,6 +263,8 @@ class RPMDBPackageSack(PackageSackBase):
mi = ts.dbMatch('basenames', name)
for hdr in mi:
+ if hdr['name'] == 'gpg-pubkey':
+ continue
pkg = self._makePackageObject(hdr, mi.instance())
if not result.has_key(pkg.pkgid):
result[pkg.pkgid] = pkg
@@ -226,6 +288,8 @@ class RPMDBPackageSack(PackageSackBase):
tag = self.DEP_TABLE[prcotype][0]
mi = ts.dbMatch(tag, misc.to_utf8(name))
for hdr in mi:
+ if hdr['name'] == 'gpg-pubkey':
+ continue
po = self._makePackageObject(hdr, mi.instance())
result[po.pkgid] = po
del mi
@@ -293,17 +357,34 @@ class RPMDBPackageSack(PackageSackBase):
return None
ret = []
for pat in patterns:
+ if not pat:
+ continue
+ qpat = pat[0]
+ if qpat in ('?', '*'):
+ qpat = None
if ignore_case:
- ret.append(re.compile(fnmatch.translate(pat), re.I))
+ if qpat is not None:
+ qpat = qpat.lower()
+ ret.append((qpat, re.compile(fnmatch.translate(pat), re.I)))
else:
- ret.append(re.compile(fnmatch.translate(pat)))
+ ret.append((qpat, re.compile(fnmatch.translate(pat))))
return ret
@staticmethod
- def _match_repattern(repatterns, hdr):
+ def _match_repattern(repatterns, hdr, ignore_case):
if repatterns is None:
return True
- for repat in repatterns:
+ for qpat, repat in repatterns:
+ epoch = hdr['epoch']
+ if epoch is None:
+ epoch = '0'
+ else:
+ epoch = str(epoch)
+ qname = hdr['name'][0]
+ if ignore_case:
+ qname = qname.lower()
+ if qpat is not None and qpat != qname and qpat != epoch[0]:
+ continue
if repat.match(hdr['name']):
return True
if repat.match("%(name)s-%(version)s-%(release)s.%(arch)s" % hdr):
@@ -314,7 +395,7 @@ class RPMDBPackageSack(PackageSackBase):
return True
if repat.match("%(name)s-%(version)s-%(release)s" % hdr):
return True
- if repat.match("%(epoch)s:%(name)s-%(version)s-%(release)s.%(arch)s"
+ if repat.match(epoch + ":%(name)s-%(version)s-%(release)s.%(arch)s"
% hdr):
return True
if repat.match("%(name)s-%(epoch)s:%(version)s-%(release)s.%(arch)s"
@@ -329,16 +410,330 @@ class RPMDBPackageSack(PackageSackBase):
if not self._completely_loaded:
rpats = self._compile_patterns(patterns, ignore_case)
for hdr, idx in self._all_packages():
- if self._match_repattern(rpats, hdr):
+ if self._match_repattern(rpats, hdr, ignore_case):
self._makePackageObject(hdr, idx)
self._completely_loaded = patterns is None
pkgobjlist = self._idx2pkg.values()
+ # Remove gpg-pubkeys, as no sane callers expects/likes them...
+ if self._loaded_gpg_keys:
+ pkgobjlist = [pkg for pkg in pkgobjlist if pkg.name != 'gpg-pubkey']
if patterns:
pkgobjlist = parsePackages(pkgobjlist, patterns, not ignore_case)
pkgobjlist = pkgobjlist[0] + pkgobjlist[1]
return pkgobjlist
+ def _uncached_returnConflictPackages(self):
+ if self._cached_conflicts_data is None:
+ ret = []
+ for pkg in self.returnPackages():
+ if len(pkg.conflicts):
+ ret.append(pkg)
+ self._cached_conflicts_data = ret
+ return self._cached_conflicts_data
+
+ def _write_conflicts_new(self, pkgs, rpmdbv):
+ if not os.access(self._cachedir, os.W_OK):
+ return
+
+ conflicts_fname = self._cachedir + '/conflicts'
+ fo = open(conflicts_fname + '.tmp', 'w')
+ fo.write("%s\n" % rpmdbv)
+ fo.write("%u\n" % len(pkgs))
+ for pkg in sorted(pkgs):
+ for var in pkg.pkgtup:
+ fo.write("%s\n" % var)
+ fo.close()
+ os.rename(conflicts_fname + '.tmp', conflicts_fname)
+
+ def _write_conflicts(self, pkgs):
+ rpmdbv = self.simpleVersion(main_only=True)[0]
+ self._write_conflicts_new(pkgs, rpmdbv)
+
+ def _read_conflicts(self):
+ if not self.__cache_rpmdb__:
+ return None
+
+ def _read_str(fo):
+ return fo.readline()[:-1]
+
+ conflict_fname = self._cachedir + '/conflicts'
+ if not os.path.exists(conflict_fname):
+ return None
+
+ fo = open(conflict_fname)
+ frpmdbv = fo.readline()
+ rpmdbv = self.simpleVersion(main_only=True)[0]
+ if not frpmdbv or rpmdbv != frpmdbv[:-1]:
+ return None
+
+ ret = []
+ try:
+ # Read the conflicts...
+ pkgtups_num = int(_read_str(fo))
+ while pkgtups_num > 0:
+ pkgtups_num -= 1
+
+ # n, a, e, v, r
+ pkgtup = (_read_str(fo), _read_str(fo),
+ _read_str(fo), _read_str(fo), _read_str(fo))
+ int(pkgtup[2]) # Check epoch is valid
+ ret.extend(self.searchPkgTuple(pkgtup))
+ if fo.readline() != '': # Should be EOF
+ return None
+ except ValueError:
+ return None
+
+ self._cached_conflicts_data = ret
+ return self._cached_conflicts_data
+
+ def transactionCacheConflictPackages(self, pkgs):
+ if self.__cache_rpmdb__:
+ self._trans_cache_store['conflicts'] = pkgs
+
+ def returnConflictPackages(self):
+ """ Return a list of packages that have conflicts. """
+ pkgs = self._read_conflicts()
+ if pkgs is None:
+ pkgs = self._uncached_returnConflictPackages()
+ if self.__cache_rpmdb__:
+ self._write_conflicts(pkgs)
+
+ return pkgs
+
+ def transactionResultVersion(self, rpmdbv):
+ """ We are going to do a transaction, and the parameter will be the
+ rpmdb version when we finish. The idea being we can update all
+ our rpmdb caches for that rpmdb version. """
+
+ if not self.__cache_rpmdb__:
+ self._trans_cache_store = {}
+ return
+
+ if 'conflicts' in self._trans_cache_store:
+ pkgs = self._trans_cache_store['conflicts']
+ self._write_conflicts_new(pkgs, rpmdbv)
+
+ if 'file-requires' in self._trans_cache_store:
+ data = self._trans_cache_store['file-requires']
+ self._write_file_requires(rpmdbv, data)
+
+ self._trans_cache_store = {}
+
+ def transactionReset(self):
+ """ We are going to reset the transaction, because the data we've added
+ already might now be invalid (Eg. skip-broken, or splitting a
+ transaction). """
+
+ self._trans_cache_store = {}
+
+ def returnGPGPubkeyPackages(self):
+ """ Return packages of the gpg-pubkeys ... hacky. """
+ ts = self.readOnlyTS()
+ mi = ts.dbMatch('name', 'gpg-pubkey')
+ ret = []
+ for hdr in mi:
+ self._loaded_gpg_keys = True
+ ret.append(self._makePackageObject(hdr, mi.instance()))
+ return ret
+
+ def _read_file_requires(self):
+ def _read_str(fo):
+ return fo.readline()[:-1]
+
+ assert self.__cache_rpmdb__
+ if not os.path.exists(self._cachedir + '/file-requires'):
+ return None, None
+
+ rpmdbv = self.simpleVersion(main_only=True)[0]
+ fo = open(self._cachedir + '/file-requires')
+ frpmdbv = fo.readline()
+ if not frpmdbv or rpmdbv != frpmdbv[:-1]:
+ return None, None
+
+ iFR = {}
+ iFP = {}
+ try:
+ # Read the requires...
+ pkgtups_num = int(_read_str(fo))
+ while pkgtups_num > 0:
+ pkgtups_num -= 1
+
+ # n, a, e, v, r
+ pkgtup = (_read_str(fo), _read_str(fo),
+ _read_str(fo), _read_str(fo), _read_str(fo))
+ int(pkgtup[2]) # Check epoch is valid
+
+ files_num = int(_read_str(fo))
+ while files_num > 0:
+ files_num -= 1
+
+ fname = _read_str(fo)
+
+ iFR.setdefault(pkgtup, []).append(fname)
+
+ # Read the provides...
+ files_num = int(_read_str(fo))
+ while files_num > 0:
+ files_num -= 1
+ fname = _read_str(fo)
+ pkgtups_num = int(_read_str(fo))
+ while pkgtups_num > 0:
+ pkgtups_num -= 1
+
+ # n, a, e, v, r
+ pkgtup = (_read_str(fo), _read_str(fo),
+ _read_str(fo), _read_str(fo), _read_str(fo))
+ int(pkgtup[2]) # Check epoch is valid
+
+ iFP.setdefault(fname, []).append(pkgtup)
+
+ if fo.readline() != '': # Should be EOF
+ return None, None
+ except ValueError:
+ return None, None
+
+ return iFR, iFP
+
+ def fileRequiresData(self):
+ """ Get a cached copy of the fileRequiresData for
+ depsolving/checkFileRequires, note the giant comment in that
+ function about how we don't keep this perfect for the providers of
+ the requires. """
+ if self.__cache_rpmdb__:
+ iFR, iFP = self._read_file_requires()
+ if iFR is not None:
+ return iFR, set(), iFP
+
+ installedFileRequires = {}
+ installedUnresolvedFileRequires = set()
+ resolved = set()
+ for pkg in self.returnPackages():
+ for name, flag, evr in pkg.requires:
+ if not name.startswith('/'):
+ continue
+ installedFileRequires.setdefault(pkg.pkgtup, []).append(name)
+ if name not in resolved:
+ dep = self.getProvides(name, flag, evr)
+ resolved.add(name)
+ if not dep:
+ installedUnresolvedFileRequires.add(name)
+
+ fileRequires = set()
+ for fnames in installedFileRequires.itervalues():
+ fileRequires.update(fnames)
+ installedFileProviders = {}
+ for fname in fileRequires:
+ pkgtups = [pkg.pkgtup for pkg in self.getProvides(fname)]
+ installedFileProviders[fname] = pkgtups
+
+ ret = (installedFileRequires, installedUnresolvedFileRequires,
+ installedFileProviders)
+ if self.__cache_rpmdb__:
+ rpmdbv = self.simpleVersion(main_only=True)[0]
+ self._write_file_requires(rpmdbv, ret)
+
+ return ret
+
+ def transactionCacheFileRequires(self, installedFileRequires,
+ installedUnresolvedFileRequires,
+ installedFileProvides,
+ problems):
+ if not self.__cache_rpmdb__:
+ return
+
+ if installedUnresolvedFileRequires or problems:
+ return
+
+ data = (installedFileRequires,
+ installedUnresolvedFileRequires,
+ installedFileProvides)
+
+ self._trans_cache_store['file-requires'] = data
+
+ def _write_file_requires(self, rpmdbversion, data):
+ if not os.access(self._cachedir, os.W_OK):
+ return
+
+ (installedFileRequires,
+ installedUnresolvedFileRequires,
+ installedFileProvides) = data
+
+ # Have to do this here, as well as in transactionCacheFileRequires,
+ # because fileRequiresData() calls us directly.
+ if installedUnresolvedFileRequires:
+ return
+
+ fo = open(self._cachedir + '/file-requires.tmp', 'w')
+ fo.write("%s\n" % rpmdbversion)
+
+ fo.write("%u\n" % len(installedFileRequires))
+ for pkgtup in sorted(installedFileRequires):
+ for var in pkgtup:
+ fo.write("%s\n" % var)
+ filenames = set(installedFileRequires[pkgtup])
+ fo.write("%u\n" % len(filenames))
+ for fname in sorted(filenames):
+ fo.write("%s\n" % fname)
+
+ fo.write("%u\n" % len(installedFileProvides))
+ for fname in sorted(installedFileProvides):
+ fo.write("%s\n" % fname)
+
+ pkgtups = set(installedFileProvides[fname])
+ fo.write("%u\n" % len(pkgtups))
+ for pkgtup in sorted(pkgtups):
+ for var in pkgtup:
+ fo.write("%s\n" % var)
+ fo.close()
+ os.rename(self._cachedir + '/file-requires.tmp',
+ self._cachedir + '/file-requires')
+
+ def _get_cached_simpleVersion_main(self):
+ """ Return the cached string of the main rpmdbv. """
+ if self._have_cached_rpmdbv_data is not None:
+ return self._have_cached_rpmdbv_data
+
+ if not self.__cache_rpmdb__:
+ return None
+
+ # This test is "obvious" and the only thing to come out of:
+ # http://lists.rpm.org/pipermail/rpm-maint/2007-November/001719.html
+ # ...if anything gets implemented, we should change.
+ rpmdbvfname = self._cachedir + "/version"
+ rpmdbfname = self.root + "/var/lib/rpm/Packages"
+
+ if os.path.exists(rpmdbvfname) and os.path.exists(rpmdbfname):
+ # See if rpmdb has "changed" ...
+ nmtime = os.path.getmtime(rpmdbvfname)
+ omtime = os.path.getmtime(rpmdbfname)
+ if omtime <= nmtime:
+ rpmdbv = open(rpmdbvfname).readline()[:-1]
+ self._have_cached_rpmdbv_data = rpmdbv
+ return self._have_cached_rpmdbv_data
+
+ def _put_cached_simpleVersion_main(self, rpmdbv):
+ self._have_cached_rpmdbv_data = str(rpmdbv)
+
+ if not self.__cache_rpmdb__:
+ return
+
+ rpmdbvfname = self._cachedir + "/version"
+ if not os.access(self._cachedir, os.W_OK):
+ if os.path.exists(self._cachedir):
+ return
+
+ try:
+ os.makedirs(self._cachedir)
+ except (IOError, OSError), e:
+ return
+
+ fo = open(rpmdbvfname + ".tmp", "w")
+ fo.write(self._have_cached_rpmdbv_data)
+ fo.write('\n')
+ fo.close()
+ os.rename(rpmdbvfname + ".tmp", rpmdbvfname)
+
def simpleVersion(self, main_only=False, groups={}):
""" Return a simple version for all installed packages. """
def _up_revs(irepos, repoid, rev, pkg, csum):
@@ -349,6 +744,11 @@ class RPMDBPackageSack(PackageSackBase):
rpsv = irevs.setdefault(rev, PackageSackVersion())
rpsv.update(pkg, csum)
+ if main_only and not groups:
+ rpmdbv = self._get_cached_simpleVersion_main()
+ if rpmdbv is not None:
+ return [rpmdbv, {}]
+
main = PackageSackVersion()
irepos = {}
main_grps = {}
@@ -382,6 +782,9 @@ class RPMDBPackageSack(PackageSackBase):
if pkg.name in groups[group]:
_up_revs(irepos_grps[group], repoid, rev, pkg, csum)
+ if self._have_cached_rpmdbv_data is None:
+ self._put_cached_simpleVersion_main(main)
+
if groups:
return [main, irepos, main_grps, irepos_grps]
return [main, irepos]
@@ -416,22 +819,6 @@ class RPMDBPackageSack(PackageSackBase):
def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
return self._search(name, epoch, ver, rel, arch)
- def contains(self, name=None, arch=None, epoch=None, ver=None, rel=None, po=None):
- """return if there are any packages in the sack that match the given NAEVR
- or the NAEVR of the given po"""
- if po:
- name = po.name
- arch = po.arch
- epoch = po.epoch
- ver = po.version
- rel = po.release
-
- if name and arch and epoch and ver and rel: # cheater lookup
- if (name, arch, epoch, ver, rel) in self._tup2pkg:
- return True
-
- return bool(self.searchNevra(name=name, arch=arch, epoch=epoch, ver=ver, rel=rel))
-
def excludeArchs(self, archlist):
pass
@@ -479,7 +866,7 @@ class RPMDBPackageSack(PackageSackBase):
def _search(self, name=None, epoch=None, ver=None, rel=None, arch=None):
'''List of matching packages, to zero or more of NEVRA.'''
pkgtup = (name, arch, epoch, ver, rel)
- if self._tup2pkg.has_key(pkgtup):
+ if pkgtup in self._tup2pkg:
return [self._tup2pkg[pkgtup]]
loc = locals()
@@ -491,7 +878,7 @@ class RPMDBPackageSack(PackageSackBase):
else:
pkgs = self.returnPkgs()
for po in pkgs:
- for tag in ('name', 'epoch', 'ver', 'rel', 'arch'):
+ for tag in ('arch', 'rel', 'ver', 'epoch'):
if loc[tag] is not None and loc[tag] != getattr(po, tag):
break
else:
@@ -508,8 +895,10 @@ class RPMDBPackageSack(PackageSackBase):
self._completely_loaded = True
for hdr in mi:
+ if hdr['name'] == 'gpg-pubkey':
+ continue
po = self._makePackageObject(hdr, mi.instance())
- for tag in ('name', 'epoch', 'ver', 'rel', 'arch'):
+ for tag in ('arch', 'rel', 'ver', 'epoch'):
if loc[tag] is not None and loc[tag] != getattr(po, tag):
break
else:
@@ -521,7 +910,7 @@ class RPMDBPackageSack(PackageSackBase):
return ret
def _makePackageObject(self, hdr, index):
- if self._idx2pkg.has_key(index):
+ if index in self._idx2pkg:
return self._idx2pkg[index]
po = RPMInstalledPackage(hdr, index, self)
self._idx2pkg[index] = po
@@ -692,6 +1081,87 @@ class RPMDBPackageSack(PackageSackBase):
# XXX deprecate?
return [po.pkgtup for po in self.getRequires(name, flags, version)]
+ def return_running_packages(self):
+ """returns a list of yum installed package objects which own a file
+ that are currently running or in use."""
+ pkgs = {}
+ for pid in misc.return_running_pids():
+ for fn in misc.get_open_files(pid):
+ for pkg in self.searchFiles(fn):
+ pkgs[pkg] = 1
+
+ return sorted(pkgs.keys())
+
+ def check_dependencies(self, pkgs=None):
+ """ Checks for any missing dependencies. """
+
+ if pkgs is None:
+ pkgs = self.returnPackages()
+
+ providers = set() # Speedup, as usual :)
+ problems = []
+ for pkg in sorted(pkgs): # The sort here is mainly for "UI"
+ for rreq in pkg.requires:
+ if rreq[0].startswith('rpmlib'): continue
+ if rreq in providers: continue
+
+ (req, flags, ver) = rreq
+ if self.getProvides(req, flags, ver):
+ providers.add(rreq)
+ continue
+ flags = yum.depsolve.flags.get(flags, flags)
+ missing = miscutils.formatRequire(req, ver, flags)
+ prob = RPMDBProblemDependency(pkg, "requires", missing=missing)
+ problems.append(prob)
+
+ for creq in pkg.conflicts:
+ if creq[0].startswith('rpmlib'): continue
+
+ (req, flags, ver) = creq
+ res = self.getProvides(req, flags, ver)
+ if not res:
+ continue
+ flags = yum.depsolve.flags.get(flags, flags)
+ found = miscutils.formatRequire(req, ver, flags)
+ prob = RPMDBProblemDependency(pkg, "conflicts", found=found,
+ conflicts=res)
+ problems.append(prob)
+ return problems
+
+ def _iter_two_pkgs(self, ignore_provides):
+ last = None
+ for pkg in sorted(self.returnPackages()):
+ if pkg.name in ignore_provides:
+ continue
+ if ignore_provides.intersection(set(pkg.provides_names)):
+ continue
+
+ if last is None:
+ last = pkg
+ continue
+ yield last, pkg
+ last = pkg
+
+ def check_duplicates(self, ignore_provides=[]):
+ """ Checks for any "duplicate packages" (those with multiple versions
+ installed), we ignore any packages with a provide in the passed
+ provide list (this is how installonlyworks, so we do the same). """
+ ignore_provides = set(ignore_provides)
+ problems = []
+ for last, pkg in self._iter_two_pkgs(ignore_provides):
+ if pkg.name != last.name:
+ continue
+ if pkg.verEQ(last) and pkg != last:
+ if arch.isMultiLibArch(pkg.arch) and last.arch != 'noarch':
+ continue
+ if arch.isMultiLibArch(last.arch) and pkg.arch != 'noarch':
+ continue
+
+ # More than one pkg, they aren't version equal, or aren't multiarch
+ problems.append(RPMDBProblemDuplicate(pkg, duplicate=last))
+ return problems
+
+
def _sanitize(path):
return path.replace('/', '').replace('~', '')
diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index b1b896f..0340153 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -26,6 +26,7 @@ import sys
from yum.constants import *
from yum import _
import misc
+import tempfile
class NoOutputCallBack:
def __init__(self):
@@ -112,7 +113,7 @@ class RPMBaseCallback:
def filelog(self, package, action):
# If the action is not in the fileaction list then dump it as a string
# hurky but, sadly, not much else
- if self.fileaction.has_key(action):
+ if action in self.fileaction:
msg = '%s: %s' % (self.fileaction[action], package)
else:
msg = '%s: %s' % (package, action)
@@ -182,7 +183,7 @@ class RPMTransaction:
self.logger = logging.getLogger('yum.filelogging.RPMInstallCallback')
self.filelog = False
- self._setupOutputLogging()
+ self._setupOutputLogging(base.conf.rpmverbosity)
if not os.path.exists(self.base.conf.persistdir):
os.makedirs(self.base.conf.persistdir) # make the dir, just in case
@@ -203,15 +204,22 @@ class RPMTransaction:
return
fcntl.fcntl(fd, fcntl.F_SETFD, current_flags | flag)
- def _setupOutputLogging(self):
+ def _setupOutputLogging(self, rpmverbosity="info"):
# UGLY... set up the transaction to record output from scriptlets
- (r, w) = os.pipe()
- # need fd objects, and read should be non-blocking
- self._readpipe = os.fdopen(r, 'r')
- self._fdSetNonblock(self._readpipe.fileno())
- self._writepipe = os.fdopen(w, 'w')
- self.base.ts.scriptFd = self._writepipe.fileno()
- rpm.setVerbosity(rpm.RPMLOG_INFO)
+ io_r = tempfile.NamedTemporaryFile()
+ self._readpipe = io_r
+ self._writepipe = open(io_r.name, 'w+b')
+ # This is dark magic, it really needs to be "base.ts.ts".
+ self.base.ts.ts.scriptFd = self._writepipe.fileno()
+ rpmverbosity = {'critical' : 'crit',
+ 'emergency' : 'emerg',
+ 'error' : 'err',
+ 'information' : 'info',
+ 'warn' : 'warning'}.get(rpmverbosity, rpmverbosity)
+ rpmverbosity = 'RPMLOG_' + rpmverbosity.upper()
+ if not hasattr(rpm, rpmverbosity):
+ rpmverbosity = 'RPMLOG_INFO'
+ rpm.setVerbosity(getattr(rpm, rpmverbosity))
rpm.setLogFile(self._writepipe)
def _shutdownOutputLogging(self):
@@ -226,6 +234,8 @@ class RPMTransaction:
def _scriptOutput(self):
try:
out = self._readpipe.read()
+ if not out:
+ return None
return out
except IOError:
pass
@@ -420,7 +430,7 @@ class RPMTransaction:
try:
fd = os.open(rpmloc, os.O_RDONLY)
except OSError, e:
- self.displaylog.errorlog("Error: Cannot open file %s: %s" % (rpmloc, e))
+ self.display.errorlog("Error: Cannot open file %s: %s" % (rpmloc, e))
else:
self.filehandles[handle]=fd
if self.trans_running:
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 5d96a96..bf0cea9 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -37,6 +37,7 @@ from yum.misc import seq_max_split
from yum.i18n import to_utf8, to_unicode
import sys
import re
+import warnings
def catchSqliteException(func):
"""This decorator converts sqlite exceptions into RepoError"""
@@ -316,7 +317,7 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
def _loadChangelog(self):
result = []
if not self._changelog:
- if not self.sack.otherdb.has_key(self.repo):
+ if self.repo not in self.sack.otherdb:
try:
self.sack.populate(self.repo, mdtype='otherdata')
except Errors.RepoError:
@@ -330,13 +331,19 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
# Check count(pkgId) here, the same way we do in searchFiles()?
# Failure mode is much less of a problem.
for ob in cur:
- c_date = ob['date']
+ # Note: Atm. rpm only does days, where (60 * 60 * 24) == 86400
+ # and we have the hack in _dump_changelog() to keep the
+ # order the same, so this is a quick way to get rid of
+ # any extra "seconds".
+ # We still leak the seconds if there are 100 updates in
+ # a day ... but don't do that. It also breaks if rpm ever
+ # gets fixed (but that is unlikely).
+ c_date = 100 * (ob['date'] / 100)
c_author = to_utf8(ob['author'])
c_log = to_utf8(ob['changelog'])
result.append((c_date, _share_data(c_author), c_log))
self._changelog = result
return
-
def returnIdSum(self):
return (self.checksum_type, self.pkgId)
@@ -345,15 +352,23 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
self._loadChangelog()
return self._changelog
- def returnFileEntries(self, ftype='file'):
+ def returnFileEntries(self, ftype='file', primary_only=False):
+ if primary_only and not self._loadedfiles:
+ sql = "SELECT name as fname FROM files WHERE pkgKey = ? and type = ?"
+ cur = self._sql_MD('primary', sql, (self.pkgKey, ftype))
+ return map(lambda x: x['fname'], cur)
+
self._loadFiles()
- return RpmBase.returnFileEntries(self,ftype)
+ return RpmBase.returnFileEntries(self,ftype,primary_only)
def returnFileTypes(self):
self._loadFiles()
return RpmBase.returnFileTypes(self)
def simpleFiles(self, ftype='file'):
+ warnings.warn('simpleFiles() will go away in a future version of Yum.'
+ 'Use returnFileEntries(primary_only=True)\n',
+ Errors.YumDeprecationWarning, stacklevel=2)
sql = "SELECT name as fname FROM files WHERE pkgKey = ? and type = ?"
cur = self._sql_MD('primary', sql, (self.pkgKey, ftype))
return map(lambda x: x['fname'], cur)
@@ -556,10 +571,10 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
return False
def _pkgKeyExcluded(self, repo, pkgKey):
- if repo in self._all_excludes:
+ if self._all_excludes and repo in self._all_excludes:
return True
- return (repo, pkgKey) in self._excludes
+ return self._excludes and (repo, pkgKey) in self._excludes
def _pkgExcludedRKNEVRA(self, repo,pkgKey, n,e,v,r,a):
''' Main function to use for "can we use this package" question.
@@ -569,7 +584,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
. Tests addPackageExcluder() calls.
'''
- if (repo, pkgKey) in self._exclude_whitelist:
+ if self._exclude_whitelist and (repo,pkgKey) in self._exclude_whitelist:
return False
if self._pkgKeyExcluded(repo, pkgKey):
@@ -627,20 +642,20 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
return False
def _pkgExcludedRKT(self, repo,pkgKey, pkgtup):
- ''' Helper function to call _pkgRKNEVRAExcluded.
+ ''' Helper function to call _pkgExcludedRKNEVRA.
Takes a repo, pkgKey and a package tuple'''
(n,a,e,v,r) = pkgtup
return self._pkgExcludedRKNEVRA(repo, pkgKey, n,e,v,r,a)
def _pkgExcludedRKD(self, repo,pkgKey, data):
- ''' Helper function to call _pkgRKNEVRAExcluded.
+ ''' Helper function to call _pkgExcludedRKNEVRA.
Takes a repo, pkgKey and a dict of package data'''
(n,a,e,v,r) = (data['name'], data['arch'],
data['epoch'], data['version'], data['release'])
return self._pkgExcludedRKNEVRA(repo, pkgKey, n,e,v,r,a)
def _pkgExcluded(self, po):
- ''' Helper function to call _pkgRKNEVRAExcluded.
+ ''' Helper function to call _pkgExcludedRKNEVRA.
Takes a package object. '''
return self._pkgExcludedRKT(po.repo, po.pkgKey, po.pkgtup)
@@ -688,10 +703,10 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
if exclude and self._pkgKeyExcluded(repo, pkgKey):
return None
- if not self._key2pkg.has_key(repo):
+ if repo not in self._key2pkg:
self._key2pkg[repo] = {}
self._pkgname2pkgkeys[repo] = {}
- if not self._key2pkg[repo].has_key(pkgKey):
+ if pkgKey not in self._key2pkg[repo]:
sql = "SELECT pkgKey, pkgId, name, epoch, version, release, arch " \
"FROM packages WHERE pkgKey = ?"
data = self._sql_MD('primary', repo, sql, (pkgKey,)).fetchone()
@@ -727,11 +742,12 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
return the pkgtup. """
if self._pkgExcludedRKD(repo, pkgKey, data):
return None
- if repo not in self._key2pkg:
+ prepo = self._key2pkg.get(repo)
+ if prepo is None:
self._key2pkg[repo] = {}
self._pkgname2pkgkeys[repo] = {}
- if data['pkgKey'] in self._key2pkg.get(repo, {}):
- return self._key2pkg[repo][data['pkgKey']].pkgtup
+ elif data['pkgKey'] in prepo:
+ return prepo[data['pkgKey']].pkgtup
return (data['name'], data['arch'],
data['epoch'], data['version'], data['release'])
@@ -1005,7 +1021,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
return result
# NOTE: I can't see any reason not to use this all the time, speed
- # comparison shows them as baiscally equal.
+ # comparison shows them as basically equal.
if len(searchstrings) > (constants.PATTERNS_MAX / len(fields)):
tot = {}
for searchstring in searchstrings:
@@ -1100,7 +1116,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
for (rep,cache) in self.primarydb.items():
cur = cache.cursor()
executeSQL(cur, "select * from packages where pkgId in %s" %(pkgid_query,))
- #executeSQL(cur, "select * from packages where pkgId in %s" %(pkgid_query,))
for ob in cur:
pkgs.append(ob)
@@ -1146,7 +1161,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
prcotype = _share_data(prcotype)
req = _share_data(req)
- if self._search_cache[prcotype].has_key(req):
+ if req in self._search_cache[prcotype]:
return self._search_cache[prcotype][req]
result = { }
@@ -1343,7 +1358,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
#~ # If it matches the dirname, that doesnt mean it matches
#~ # the filename, check if it does
- #~ if filename and not quicklookup.has_key(filename):
+ #~ if filename and filename not in quicklookup:
#~ continue
#~ matching_ids.append(str(res['pkgId']))
@@ -1420,6 +1435,11 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
@catchSqliteException
def returnNewestByName(self, name=None, patterns=None, ignore_case=False):
+ """return list of newest packages based on name matching
+ this means(in name.arch form): foo.i386 and foo.noarch will
+ be compared to each other for highest version.
+ Note that given: foo-1.i386; foo-2.i386 and foo-3.x86_64
+ The last _two_ pkgs will be returned, not just one of them. """
# If name is set do it from the database otherwise use our parent's
# returnNewestByName
if self._skip_all():
@@ -1516,24 +1536,24 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
"""Yields all the package data for the given params. Excludes are done
at this stage. """
+ pat_sqls = []
+ pat_data = []
+ for (pattern, rest) in patterns:
+ for field in fields:
+ if ignore_case:
+ pat_sqls.append("%s LIKE ?%s" % (field, rest))
+ else:
+ pat_sqls.append("%s %s ?" % (field, rest))
+ pat_data.append(pattern)
+ if pat_sqls:
+ qsql = _FULL_PARSE_QUERY_BEG + " OR ".join(pat_sqls)
+ else:
+ qsql = """select pkgId, pkgKey, name,epoch,version,release,arch
+ from packages"""
+
for (repo,cache) in self.primarydb.items():
if (repoid == None or repoid == repo.id):
cur = cache.cursor()
-
- qsql = """select pkgId, pkgKey, name,epoch,version,release,arch
- from packages"""
-
- pat_sqls = []
- pat_data = []
- for (pattern, rest) in patterns:
- for field in fields:
- if ignore_case:
- pat_sqls.append("%s LIKE ?%s" % (field, rest))
- else:
- pat_sqls.append("%s %s ?" % (field, rest))
- pat_data.append(pattern)
- if pat_sqls:
- qsql = _FULL_PARSE_QUERY_BEG + " OR ".join(pat_sqls)
executeSQL(cur, qsql, pat_data)
for x in cur:
yield (repo, x)
@@ -1617,6 +1637,9 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
# Haven't loaded everything, so _just_ get the pkgtups...
data = self._setupPkgObjList(repoid, patterns, ignore_case)
(need_full, patterns, fields, names) = data
+ if names:
+ return [pkg.pkgtup for pkg in self.searchNames(patterns)]
+
for (repo, x) in self._yieldSQLDataList(repoid, patterns, fields,
ignore_case):
# NOTE: Can't unexclude things...
diff --git a/yum/sqlutils.py b/yum/sqlutils.py
index 3a93146..4326910 100644
--- a/yum/sqlutils.py
+++ b/yum/sqlutils.py
@@ -104,7 +104,7 @@ def QmarkToPyformat(query, params):
"""Convert from qmark to pyformat parameter style.
The python DB-API 2.0 specifies four different possible parameter
- styles that can be used by drivers. This function convers from the
+ styles that can be used by drivers. This function converts from the
qmark style to pyformat style.
@param query: SQL query to transform
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index bd7bf80..30a2625 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -26,11 +26,48 @@ to rpm.
"""
from constants import *
-from packageSack import PackageSack
+from packageSack import PackageSack, PackageSackVersion
from packages import YumInstalledPackage
from sqlitesack import YumAvailablePackageSqlite
import Errors
import warnings
+import misc
+
+class GetProvReqOnlyPackageSack(PackageSack):
+ def __init__(self, need_files=False):
+ PackageSack.__init__(self)
+ self._need_index_files = need_files
+
+ def __addPackageToIndex_primary_files(self, obj):
+ for ftype in obj.returnFileTypes():
+ for file in obj.returnFileEntries(ftype, primary_only=True):
+ self._addToDictAsList(self.filenames, file, obj)
+ def __addPackageToIndex_files(self, obj):
+ for ftype in obj.returnFileTypes():
+ for file in obj.returnFileEntries(ftype):
+ self._addToDictAsList(self.filenames, file, obj)
+ def _addPackageToIndex(self, obj):
+ for (n, fl, (e,v,r)) in obj.returnPrco('provides'):
+ self._addToDictAsList(self.provides, n, obj)
+ for (n, fl, (e,v,r)) in obj.returnPrco('requires'):
+ self._addToDictAsList(self.requires, n, obj)
+ if self._need_index_files:
+ self.__addPackageToIndex_files(obj)
+ else:
+ self.__addPackageToIndex_primary_files(obj)
+
+ def __buildFileIndexes(self):
+ for repoid in self.pkgsByRepo:
+ for obj in self.pkgsByRepo[repoid]:
+ self.__addPackageToIndex_files(obj)
+ def searchFiles(self, name):
+ if not self._need_index_files and not misc.re_primary_filename(name):
+ self._need_index_files = True
+ if self.indexesBuilt:
+ self.filenames = {}
+ self.__buildFileIndexes()
+
+ return PackageSack.searchFiles(self, name)
class TransactionData:
"""Data Structure designed to hold information on a yum Transaction Set"""
@@ -52,6 +89,9 @@ class TransactionData:
self.pkgSack = None
self.pkgSackPackages = 0
self.localSack = PackageSack()
+ # FIXME: This is turned off atm. ... it'll be turned on when
+ # the new yum-metadata-parser with the "pkgfiles" index is std.
+ self._inSack = None # GetProvReqOnlyPackageSack()
# lists of txmbrs in their states - just placeholders
self.instgroups = []
@@ -183,7 +223,7 @@ class TransactionData:
for oldpo in txmember.updates:
self.addUpdated(oldpo, txmember.po)
- if not self.pkgdict.has_key(txmember.pkgtup):
+ if txmember.pkgtup not in self.pkgdict:
self.pkgdict[txmember.pkgtup] = []
else:
self.debugprint("Package: %s.%s - %s:%s-%s already in ts" % txmember.pkgtup)
@@ -198,6 +238,8 @@ class TransactionData:
self.localSack.addPackage(txmember.po)
elif isinstance(txmember.po, YumAvailablePackageSqlite):
self.pkgSackPackages += 1
+ if self._inSack is not None and txmember.output_state in TS_INSTALL_STATES:
+ self._inSack.addPackage(txmember.po)
if self.conditionals.has_key(txmember.name):
for pkg in self.conditionals[txmember.name]:
@@ -210,7 +252,7 @@ class TransactionData:
def remove(self, pkgtup):
"""remove a package from the transaction"""
- if not self.pkgdict.has_key(pkgtup):
+ if pkgtup not in self.pkgdict:
self.debugprint("Package: %s not in ts" %(pkgtup,))
return
for txmbr in self.pkgdict[pkgtup]:
@@ -219,6 +261,8 @@ class TransactionData:
self.localSack.delPackage(txmbr.po)
elif isinstance(txmbr.po, YumAvailablePackageSqlite):
self.pkgSackPackages -= 1
+ if self._inSack is not None and txmbr.output_state in TS_INSTALL_STATES:
+ self._inSack.delPackage(txmbr.po)
self._namedict[txmbr.name].remove(txmbr)
self._unresolvedMembers.add(txmbr)
@@ -443,6 +487,12 @@ class TransactionData:
txmbr.relatedto.append((obsoleting_po, 'obsoletedby'))
txmbr.obsoleted_by.append(obsoleting_po)
self.add(txmbr)
+ for otxmbr in self.getMembersWithState(obsoleting_po.pkgtup,
+ [TS_OBSOLETING]):
+ if po in otxmbr.obsoletes:
+ continue
+ otxmbr.relatedto.append((po, 'obsoletes'))
+ otxmbr.obsoletes.append(po)
return txmbr
@@ -454,10 +504,15 @@ class TransactionData:
"""return dict { packages -> list of matching provides }
searches in packages to be installed"""
result = { }
- if self.pkgSackPackages:
+ if not self.pkgSackPackages:
+ pass
+ elif self._inSack is None:
for pkg, hits in self.pkgSack.getProvides(name, flag, version).iteritems():
if self.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES):
result[pkg] = hits
+ else:
+ for pkg, hits in self._inSack.getProvides(name, flag, version).iteritems():
+ result[pkg] = hits
result.update(self.localSack.getProvides(name, flag, version))
return result
@@ -480,10 +535,16 @@ class TransactionData:
"""return dict { packages -> list of matching provides }
searches in packages to be installed"""
result = { }
- if self.pkgSackPackages:
+ if not self.pkgSackPackages:
+ pass
+ elif self._inSack is None:
for pkg, hits in self.pkgSack.getRequires(name, flag, version).iteritems():
if self.getMembersWithState(pkg.pkgtup, TS_INSTALL_STATES):
result[pkg] = hits
+ else:
+ for pkg, hits in self._inSack.getRequires(name, flag, version).iteritems():
+ result[pkg] = hits
+
result.update(self.localSack.getRequires(name, flag, version))
return result
@@ -503,6 +564,42 @@ class TransactionData:
result.update(self.getNewRequires(name, flag, version))
return result
+ def futureRpmDBVersion(self):
+ """ Return a simple version for the future rpmdb. Works like
+ rpmdb.simpleVersion(main_only=True)[0], but for the state the rpmdb
+ will be in after the transaction. """
+ pkgs = self.rpmdb.returnPackages()
+ _reinstalled_pkgtups = {}
+ for txmbr in self.getMembersWithState(None, TS_INSTALL_STATES):
+ # reinstalls have to use their "new" checksum data, in case it's
+ # different.
+ if hasattr(txmbr, 'reinstall') and txmbr.reinstall:
+ _reinstalled_pkgtups[txmbr.po.pkgtup] = txmbr.po
+ pkgs.append(txmbr.po)
+
+ main = PackageSackVersion()
+ for pkg in sorted(pkgs):
+ if pkg.repoid != 'installed':
+ # Paste from PackageSackBase.simpleVersion()
+ csum = pkg.returnIdSum()
+ main.update(pkg, csum)
+ continue
+
+ # Installed pkg, see if it's about to die
+ if self.getMembersWithState(pkg.pkgtup, TS_REMOVE_STATES):
+ continue
+ # ...or die and be risen again (Zombie!)
+ if pkg.pkgtup in _reinstalled_pkgtups:
+ continue
+
+ # Paste from rpmdb.simpleVersion()
+ ydbi = pkg.yumdb_info
+ csum = None
+ if 'checksum_type' in ydbi and 'checksum_data' in ydbi:
+ csum = (ydbi.checksum_type, ydbi.checksum_data)
+ main.update(pkg, csum)
+ return main
+
class ConditionalTransactionData(TransactionData):
"""A transaction data implementing conditional package addition"""
def __init__(self):
@@ -560,6 +657,7 @@ class SortableTransactionData(TransactionData):
self._sorted.reverse()
return self._sorted
+
class TransactionMember:
"""Class to describe a Transaction Member (a pkg to be installed/
updated/erased)."""
@@ -605,7 +703,7 @@ class TransactionMember:
return object.__hash__(self)
def __str__(self):
- return "%s.%s %s-%s-%s - %s" % (self.name, self.arch, self.epoch,
+ return "%s.%s %s:%s-%s - %s" % (self.name, self.arch, self.epoch,
self.version, self.release, self.ts_state)
def __repr__(self):
diff --git a/yum/update_md.py b/yum/update_md.py
index b3a120e..54d4cd7 100644
--- a/yum/update_md.py
+++ b/yum/update_md.py
@@ -75,6 +75,9 @@ class UpdateNotice(object):
""" Allows scriptable metadata access (ie: un['update_id']). """
return self._md.has_key(item) and self._md[item] or None
+ def __setitem__(self, item, val):
+ self._md[item] = val
+
def __str__(self):
head = """
===============================================================================
@@ -95,7 +98,7 @@ class UpdateNotice(object):
if len(bzs):
buglist = " Bugs :"
for bz in bzs:
- buglist += " %s%s\n\t :" % (bz['id'], bz.has_key('title')
+ buglist += " %s%s\n\t :" % (bz['id'], 'title' in bz
and ' - %s' % bz['title'] or '')
head += buglist[: - 1].rstrip() + '\n'
@@ -201,7 +204,7 @@ class UpdateNotice(object):
"""
for collection in elem:
data = { 'packages' : [] }
- if collection.attrib.has_key('short'):
+ if 'short' in collection.attrib:
data['short'] = collection.attrib.get('short')
for item in collection:
if item.tag == 'name':
@@ -357,6 +360,21 @@ class UpdateMetadata(object):
ret.sort(cmp=_rpm_tup_vercmp, key=lambda x: x[0], reverse=True)
return ret
+ def add_notice(self, un):
+ """ Add an UpdateNotice object. This should be fully populated with
+ data, esp. update_id and pkglist/packages. """
+ if not un or not un["update_id"] or un['update_id'] in self._notices:
+ return
+
+ self._notices[un['update_id']] = un
+ for pkg in un['pkglist']:
+ for filedata in pkg['packages']:
+ self._cache['%s-%s-%s' % (filedata['name'],
+ filedata['version'],
+ filedata['release'])] = un
+ no = self._no_cache.setdefault(filedata['name'], set())
+ no.add(un)
+
def add(self, obj, mdtype='updateinfo'):
""" Parse a metadata from a given YumRepository, file, or filename. """
if not obj:
@@ -383,15 +401,7 @@ class UpdateMetadata(object):
print >> sys.stderr, "An update notice is broken, skipping."
# what else should we do?
continue
- if not self._notices.has_key(un['update_id']):
- self._notices[un['update_id']] = un
- for pkg in un['pkglist']:
- for file in pkg['packages']:
- self._cache['%s-%s-%s' % (file['name'],
- file['version'],
- file['release'])] = un
- no = self._no_cache.setdefault(file['name'], set())
- no.add(un)
+ self.add_notice(un)
def __unicode__(self):
ret = u''
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 64b175e..fa1c104 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -366,18 +366,30 @@ class YumRepository(Repository, config.RepoConf):
def dump(self):
output = '[%s]\n' % self.id
- vars = ['name', 'bandwidth', 'enabled', 'enablegroups',
- 'gpgcheck', 'repo_gpgcheck', # FIXME: gpgcheck => pkgs_gpgcheck
- 'includepkgs', 'keepalive', 'proxy',
- 'proxy_password', 'proxy_username', 'exclude',
- 'retries', 'throttle', 'timeout', 'mirrorlist', 'metalink',
- 'cachedir', 'gpgkey', 'pkgdir', 'hdrdir']
- vars.sort()
- for attr in vars:
- output = output + '%s = %s\n' % (attr, getattr(self, attr))
- output = output + 'baseurl ='
- for url in self.urls:
- output = output + ' %s\n' % url
+ # we exclude all vars which start with _ or are in this list:
+ excluded_vars = ('mediafunc', 'sack', 'metalink_data', 'grab',
+ 'grabfunc', 'repoXML', 'cfg', 'retrieved',
+ 'mirrorlistparsed', 'gpg_import_func', 'failure_obj',
+ 'callback', 'confirm_func', 'groups_added',
+ 'interrupt_callback', 'id', 'mirror_failure_obj',
+ 'repo_config_age', 'groupsfilename', 'copy_local',
+ 'basecachedir', 'http_headers', 'metadata_cookie',
+ 'metadata_cookie_fn', 'quick_enable_disable',
+ 'repoMDFile', 'timestamp_check', 'urls', 'mirrorurls',
+ 'yumvar', 'repofile')
+ for attr in dir(self):
+ if attr.startswith('_'):
+ continue
+ if attr in excluded_vars:
+ continue
+ if isinstance(getattr(self, attr), types.MethodType):
+ continue
+ res = getattr(self, attr)
+ if not res:
+ res = ''
+ if type(res) == types.ListType:
+ res = ',\n '.join(res)
+ output = output + '%s = %s\n' % (attr, res)
return output
@@ -441,12 +453,14 @@ class YumRepository(Repository, config.RepoConf):
self._proxy_dict['https'] = proxy_string
self._proxy_dict['ftp'] = proxy_string
- def __headersListFromDict(self):
+ def __headersListFromDict(self, cache=True):
"""Convert our dict of headers to a list of 2-tuples for urlgrabber."""
headers = []
for key in self.http_headers:
headers.append((key, self.http_headers[key]))
+ if not (cache or 'Pragma' in self.http_headers):
+ headers.append(('Pragma', 'no-cache'))
return headers
@@ -464,31 +478,34 @@ class YumRepository(Repository, config.RepoConf):
else:
mgclass = urlgrabber.mirror.MirrorGroup
- headers = tuple(self.__headersListFromDict())
-
- self._grabfunc = URLGrabber(keepalive=self.keepalive,
- bandwidth=self.bandwidth,
- retry=self.retries,
- throttle=self.throttle,
- progress_obj=self.callback,
- proxies = self.proxy_dict,
+ ugopts = self._default_grabopts()
+ self._grabfunc = URLGrabber(progress_obj=self.callback,
failure_callback=self.failure_obj,
interrupt_callback=self.interrupt_callback,
- timeout=self.timeout,
copy_local=self.copy_local,
- http_headers=headers,
reget='simple',
- ssl_verify_peer=self.sslverify,
- ssl_verify_host=self.sslverify,
- ssl_ca_cert=self.sslcacert,
- ssl_cert=self.sslclientcert,
- ssl_key=self.sslclientkey)
-
- self._grabfunc.opts.user_agent = default_grabber.opts.user_agent
+ **ugopts)
self._grab = mgclass(self._grabfunc, self.urls,
failure_callback=self.mirror_failure_obj)
+ def _default_grabopts(self, cache=True):
+ opts = { 'keepalive': self.keepalive,
+ 'bandwidth': self.bandwidth,
+ 'retry': self.retries,
+ 'throttle': self.throttle,
+ 'proxies': self.proxy_dict,
+ 'timeout': self.timeout,
+ 'http_headers': tuple(self.__headersListFromDict(cache=cache)),
+ 'ssl_verify_peer': self.sslverify,
+ 'ssl_verify_host': self.sslverify,
+ 'ssl_ca_cert': self.sslcacert,
+ 'ssl_cert': self.sslclientcert,
+ 'ssl_key': self.sslclientkey,
+ 'user_agent': default_grabber.opts.user_agent,
+ }
+ return opts
+
def _getgrabfunc(self):
if not self._grabfunc or self._callbacks_changed:
self._setupGrab()
@@ -669,18 +686,9 @@ class YumRepository(Repository, config.RepoConf):
local = self.metalink_filename + '.tmp'
if not self._metalinkCurrent():
url = misc.to_utf8(self.metalink)
+ ugopts = self._default_grabopts()
try:
- ug = URLGrabber(bandwidth = self.bandwidth,
- retry = self.retries,
- throttle = self.throttle,
- progress_obj = self.callback,
- proxies=self.proxy_dict,
- ssl_verify_peer=self.sslverify,
- ssl_verify_host=self.sslverify,
- ssl_ca_cert=self.sslcacert,
- ssl_cert=self.sslclientcert,
- ssl_key=self.sslclientkey)
- ug.opts.user_agent = default_grabber.opts.user_agent
+ ug = URLGrabber(progress_obj = self.callback, **ugopts)
result = ug.urlgrab(url, local, text=self.id + "/metalink")
except urlgrabber.grabber.URLGrabError, e:
@@ -726,15 +734,6 @@ class YumRepository(Repository, config.RepoConf):
# if url is None do a grab via the mirror group/grab for the repo
# return the path to the local file
- # Turn our dict into a list of 2-tuples
- headers = self.__headersListFromDict()
-
- # We will always prefer to send no-cache.
- if not (cache or self.http_headers.has_key('Pragma')):
- headers.append(('Pragma', 'no-cache'))
-
- headers = tuple(headers)
-
# if copylocal isn't specified pickup the repo-defined attr
if copy_local is None:
copy_local = self.copy_local
@@ -770,28 +769,15 @@ class YumRepository(Repository, config.RepoConf):
verbose_logger.log(logginglevels.DEBUG_2, "Error getting package from media; falling back to url %s" %(e,))
if url and scheme != "media":
- ug = URLGrabber(keepalive = self.keepalive,
- bandwidth = self.bandwidth,
- retry = self.retries,
- throttle = self.throttle,
- progress_obj = self.callback,
+ ugopts = self._default_grabopts(cache=cache)
+ ug = URLGrabber(progress_obj = self.callback,
copy_local = copy_local,
reget = reget,
- proxies = self.proxy_dict,
failure_callback = self.failure_obj,
interrupt_callback=self.interrupt_callback,
- timeout=self.timeout,
checkfunc=checkfunc,
- http_headers=headers,
- ssl_verify_peer=self.sslverify,
- ssl_verify_host=self.sslverify,
- ssl_ca_cert=self.sslcacert,
- ssl_cert=self.sslclientcert,
- ssl_key=self.sslclientkey,
- size=size
- )
-
- ug.opts.user_agent = default_grabber.opts.user_agent
+ size=size,
+ **ugopts)
remote = url + '/' + relative
@@ -812,6 +798,7 @@ class YumRepository(Repository, config.RepoConf):
else:
+ headers = tuple(self.__headersListFromDict(cache=cache))
try:
result = self.grab.urlgrab(misc.to_utf8(relative), local,
text = misc.to_utf8(text),
@@ -1133,22 +1120,16 @@ class YumRepository(Repository, config.RepoConf):
if repoXML.length != repomd.size:
return False
- # MirrorManager isn't generating sha256 yet, and we should probably
- # not require all of the checksums we produce.
- done = set()
for checksum in repoXML.checksums:
if checksum not in repomd.chksums:
continue
if repoXML.checksums[checksum] != repomd.chksums[checksum]:
return False
- done.add(checksum)
- # Only allow approved checksums, might want to not "approve" of
- # sha1/md5
- for checksum in ('sha512', 'sha256', 'sha1', 'md5'):
- if checksum in done:
- return True
+ # If we don't trust the checksum, then don't generate it in
+ # repoMDObject().
+ return True
return False
@@ -1213,20 +1194,21 @@ class YumRepository(Repository, config.RepoConf):
else:
caching = False
if self._latestRepoXML(local):
- self._revertOldRepoXML()
- self.setMetadataCookie()
- return False
-
- result = self._getFileRepoXML(local, text)
- if result is None:
- # Ignore this as we have a copy
- self._revertOldRepoXML()
- return False
+ result = local
+ old_data = self._oldRepoMDData
+ self._repoXML = old_data['old_repo_XML']
+ else:
+ result = self._getFileRepoXML(local, text)
+ if result is None:
+ # Ignore this as we have a copy
+ self._revertOldRepoXML()
+ return False
# if we have a 'fresh' repomd.xml then update the cookie
self.setMetadataCookie()
- self._repoXML = self._parseRepoXML(result)
+ if self._repoXML is None:
+ self._repoXML = self._parseRepoXML(result)
if self._repoXML is None:
self._revertOldRepoXML()
return False
@@ -1243,7 +1225,7 @@ class YumRepository(Repository, config.RepoConf):
def _check_db_version(self, mdtype, repoXML=None):
if repoXML is None:
repoXML = self.repoXML
- if repoXML.repoData.has_key(mdtype):
+ if mdtype in repoXML.repoData:
if DBVERSION == repoXML.repoData[mdtype].dbversion:
return True
return False
@@ -1314,6 +1296,8 @@ class YumRepository(Repository, config.RepoConf):
# Inited twice atm. ... sue me
self._oldRepoMDData['new_MD_files'] = []
+ downloading_with_size = []
+ downloading_no_size = []
for mdtype in all_mdtypes:
(nmdtype, ndata) = self._get_mdtype_data(mdtype)
@@ -1341,10 +1325,33 @@ class YumRepository(Repository, config.RepoConf):
if self._groupCheckDataMDValid(ndata, nmdtype, mdtype):
continue
+ if ndata.size is None:
+ downloading_no_size.append((ndata, nmdtype))
+ else:
+ downloading_with_size.append((ndata, nmdtype))
+
+ if len(downloading_with_size) == 1:
+ downloading_no_size.extend(downloading_with_size)
+ downloading_with_size = []
+
+ remote_size = 0
+ local_size = 0
+ for (ndata, nmdtype) in downloading_with_size: # Get total size...
+ remote_size += int(ndata.size)
+
+ for (ndata, nmdtype) in downloading_with_size:
+ urlgrabber.progress.text_meter_total_size(remote_size, local_size)
+ if not self._retrieveMD(nmdtype, retrieve_can_fail=True):
+ self._revertOldRepoXML()
+ return False
+ local_size += int(ndata.size)
+ urlgrabber.progress.text_meter_total_size(0)
+ for (ndata, nmdtype) in downloading_no_size:
if not self._retrieveMD(nmdtype, retrieve_can_fail=True):
self._revertOldRepoXML()
return False
+ for (ndata, nmdtype) in downloading_with_size + downloading_no_size:
local = self._get_mdtype_fname(ndata, False)
if nmdtype.endswith("_db"): # Uncompress any .sqlite.bz2 files
dl_local = local
@@ -1367,8 +1374,7 @@ class YumRepository(Repository, config.RepoConf):
if self._commonLoadRepoXML(text):
self._commonRetrieveDataMD(mdtypes)
- def _loadRepoXML(self, text=None):
- """retrieve/check/read in repomd.xml from the repository"""
+ def _mdpolicy2mdtypes(self):
md_groups = {'instant' : [],
'group:primary' : ['primary'],
'group:small' : ["primary", "updateinfo"],
@@ -1385,9 +1391,12 @@ class YumRepository(Repository, config.RepoConf):
mdtypes = None
else:
mdtypes = sorted(list(mdtypes))
+ return mdtypes
+ def _loadRepoXML(self, text=None):
+ """retrieve/check/read in repomd.xml from the repository"""
try:
- return self._groupLoadRepoXML(text, mdtypes)
+ return self._groupLoadRepoXML(text, self._mdpolicy2mdtypes())
except KeyboardInterrupt:
self._revertOldRepoXML() # Undo metadata cookie?
raise
@@ -1618,7 +1627,7 @@ class YumRepository(Repository, config.RepoConf):
print "Could not read mirrorlist %s, error was \n%s" %(url, e)
content = []
for line in content:
- if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
+ if re.match('\s*(#|$)', line):
continue
mirror = line.rstrip() # no more trailing \n's
mirror = mirror.replace('$ARCH', '$BASEARCH')
@@ -1647,8 +1656,9 @@ class YumRepository(Repository, config.RepoConf):
scheme = urlparse.urlparse(url)[0]
if scheme == '':
url = 'file://' + url
+ ugopts = self._default_grabopts()
try:
- fo = urlgrabber.grabber.urlopen(url, proxies=self.proxy_dict)
+ fo = urlgrabber.grabber.urlopen(url, **ugopts)
except urlgrabber.grabber.URLGrabError, e:
print "Could not retrieve mirrorlist %s error was\n%s: %s" % (url, e.args[0], misc.to_unicode(e.args[1]))
fo = None
@@ -1820,7 +1830,7 @@ def getMirrorList(mirrorlist, pdict = None):
if fo is not None:
content = fo.readlines()
for line in content:
- if re.match('^\s*\#.*', line) or re.match('^\s*$', line):
+ if re.match('\s*(#|$)', line):
continue
mirror = line.rstrip() # no more trailing \n's
mirror = mirror.replace('$ARCH', '$BASEARCH')
diff --git a/yumcommands.py b/yumcommands.py
index 1451a36..35bd97c 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -23,6 +23,7 @@ import os
import cli
from yum import logginglevels
from yum import _
+from yum import misc
import yum.Errors
import operator
import locale
@@ -84,7 +85,7 @@ def checkGroupArg(base, basecmd, extcmds):
def checkCleanArg(base, basecmd, extcmds):
VALID_ARGS = ('headers', 'packages', 'metadata', 'dbcache', 'plugins',
- 'expire-cache', 'all')
+ 'expire-cache', 'rpmdb', 'all')
if len(extcmds) == 0:
base.logger.critical(_('Error: clean requires an option: %s') % (
@@ -209,10 +210,7 @@ def _add_pkg_simple_list_lens(data, pkg, indent=''):
This "knows" about simpleList and printVer. """
na = len(pkg.name) + 1 + len(pkg.arch) + len(indent)
ver = len(pkg.version) + 1 + len(pkg.release)
- if pkg.repoid == 'installed' and 'from_repo' in pkg.yumdb_info:
- rid = len(pkg.yumdb_info.from_repo) + 1
- else:
- rid = len(pkg.repoid)
+ rid = len(pkg.ui_from_repo)
if pkg.epoch != '0':
ver += len(pkg.epoch) + 1
for (d, v) in (('na', na), ('ver', ver), ('rid', rid)):
@@ -774,6 +772,9 @@ class RepoListCommand(YumCommand):
return True
return False
+ def _num2ui_num(num):
+ return to_unicode(locale.format("%d", num, True))
+
if len(extcmds) >= 1 and extcmds[0] in ('all', 'disabled', 'enabled'):
arg = extcmds[0]
extcmds = extcmds[1:]
@@ -782,49 +783,80 @@ class RepoListCommand(YumCommand):
extcmds = map(lambda x: x.lower(), extcmds)
verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3)
- try:
- # Setup so len(repo.sack) is correct
- base.repos.populateSack()
- except yum.Errors.RepoError:
- if verbose:
- raise
+ if arg != 'disabled' or extcmds:
+ try:
+ # Setup so len(repo.sack) is correct
+ base.repos.populateSack()
+ base.pkgSack # Need to setup the pkgSack, so excludes work
+ except yum.Errors.RepoError:
+ if verbose:
+ raise
repos = base.repos.repos.values()
repos.sort()
enabled_repos = base.repos.listEnabled()
- if arg == 'all':
- ehibeg = base.term.FG_COLOR['green'] + base.term.MODE['bold']
- dhibeg = base.term.FG_COLOR['red']
- hiend = base.term.MODE['normal']
- else:
- ehibeg = ''
- dhibeg = ''
- hiend = ''
+ on_ehibeg = base.term.FG_COLOR['green'] + base.term.MODE['bold']
+ on_dhibeg = base.term.FG_COLOR['red']
+ on_hiend = base.term.MODE['normal']
tot_num = 0
cols = []
for repo in repos:
if len(extcmds) and not _repo_match(repo, extcmds):
continue
+ (ehibeg, dhibeg, hiend) = '', '', ''
+ ui_enabled = ''
+ ui_endis_wid = 0
+ ui_num = ""
+ ui_excludes_num = ''
+ force_show = False
+ if arg == 'all' or repo.id in extcmds or repo.name in extcmds:
+ force_show = True
+ (ehibeg, dhibeg, hiend) = (on_ehibeg, on_dhibeg, on_hiend)
if repo in enabled_repos:
enabled = True
- ui_enabled = ehibeg + _('enabled') + hiend + ": "
- ui_endis_wid = utf8_width(_('enabled')) + 2
- num = len(repo.sack)
- tot_num += num
- ui_num = to_unicode(locale.format("%d", num, True))
+ if arg == 'enabled':
+ force_show = False
+ elif arg == 'disabled' and not force_show:
+ continue
+ if force_show or verbose:
+ ui_enabled = ehibeg + _('enabled') + hiend
+ ui_endis_wid = utf8_width(_('enabled'))
+ if not verbose:
+ ui_enabled += ": "
+ ui_endis_wid += 2
if verbose:
ui_size = _repo_size(repo)
+ # We don't show status for list disabled
+ if arg != 'disabled' or verbose:
+ if verbose or base.conf.exclude or repo.exclude:
+ num = len(repo.sack.simplePkgList())
+ else:
+ num = len(repo.sack)
+ ui_num = _num2ui_num(num)
+ excludes = repo.sack._excludes
+ excludes = len([pid for r,pid in excludes if r == repo])
+ if excludes:
+ ui_excludes_num = _num2ui_num(excludes)
+ if not verbose:
+ ui_num += "+%s" % ui_excludes_num
+ tot_num += num
else:
enabled = False
+ if arg == 'disabled':
+ force_show = False
+ elif arg == 'enabled' and not force_show:
+ continue
ui_enabled = dhibeg + _('disabled') + hiend
ui_endis_wid = utf8_width(_('disabled'))
- ui_num = ""
-
- if (arg == 'all' or
- (arg == 'enabled' and enabled) or
- (arg == 'disabled' and not enabled)):
+
+ if True: # Here to make patch smaller, TODO: rm
if not verbose:
- cols.append((str(repo), repo.name,
+ rid = str(repo)
+ if enabled and repo.metalink:
+ mdts = repo.metalink_data.repomd.timestamp
+ if mdts > repo.repoXML.timestamp:
+ rid = '*' + rid
+ cols.append((rid, repo.name,
(ui_enabled, ui_endis_wid), ui_num))
else:
if enabled:
@@ -832,8 +864,11 @@ class RepoListCommand(YumCommand):
else:
md = None
out = [base.fmtKeyValFill(_("Repo-id : "), repo),
- base.fmtKeyValFill(_("Repo-name : "), repo.name),
- base.fmtKeyValFill(_("Repo-status : "), ui_enabled)]
+ base.fmtKeyValFill(_("Repo-name : "), repo.name)]
+
+ if force_show or extcmds:
+ out += [base.fmtKeyValFill(_("Repo-status : "),
+ ui_enabled)]
if md and md.revision is not None:
out += [base.fmtKeyValFill(_("Repo-revision: "),
md.revision)]
@@ -889,7 +924,7 @@ class RepoListCommand(YumCommand):
elif not repo.metadata_expire:
num = _("Instant (last: %s)") % last
else:
- num = locale.format("%d", repo.metadata_expire, True)
+ num = _num2ui_num(repo.metadata_expire)
num = _("%s second(s) (last: %s)") % (num, last)
out += [base.fmtKeyValFill(_("Repo-expire : "), num)]
@@ -902,16 +937,20 @@ class RepoListCommand(YumCommand):
out += [base.fmtKeyValFill(_("Repo-include : "),
", ".join(repo.includepkgs))]
+ if ui_excludes_num:
+ out += [base.fmtKeyValFill(_("Repo-excluded: "),
+ ui_excludes_num)]
+
base.verbose_logger.log(logginglevels.DEBUG_3,
"%s\n",
- "\n".join(out))
+ "\n".join(map(misc.to_unicode, out)))
if not verbose and cols:
# Work out the first (id) and last (enabled/disalbed/count),
# then chop the middle (name)...
id_len = utf8_width(_('repo id'))
nm_len = 0
- ct_len = 0
+ st_len = 0
ui_len = 0
for (rid, rname, (ui_enabled, ui_endis_wid), ui_num) in cols:
@@ -919,14 +958,17 @@ class RepoListCommand(YumCommand):
id_len = utf8_width(rid)
if nm_len < utf8_width(rname):
nm_len = utf8_width(rname)
- if ct_len < ui_endis_wid:
- ct_len = ui_endis_wid
+ if st_len < (ui_endis_wid + len(ui_num)):
+ st_len = (ui_endis_wid + len(ui_num))
+ # Need this as well as above for: utf8_width_fill()
if ui_len < len(ui_num):
ui_len = len(ui_num)
- if utf8_width(_('status')) > ct_len + ui_len:
+ if arg == 'disabled': # Don't output a status column.
+ left = base.term.columns - (id_len + 1)
+ elif utf8_width(_('status')) > st_len:
left = base.term.columns - (id_len + utf8_width(_('status')) +2)
else:
- left = base.term.columns - (id_len + ct_len + ui_len + 2)
+ left = base.term.columns - (id_len + st_len + 2)
if left < nm_len: # Name gets chopped
nm_len = left
@@ -937,9 +979,20 @@ class RepoListCommand(YumCommand):
txt_rid = utf8_width_fill(_('repo id'), id_len)
txt_rnam = utf8_width_fill(_('repo name'), nm_len, nm_len)
- base.verbose_logger.log(logginglevels.INFO_2,"%s %s %s",
- txt_rid, txt_rnam, _('status'))
+ if arg == 'disabled': # Don't output a status column.
+ base.verbose_logger.log(logginglevels.INFO_2,"%s %s",
+ txt_rid, txt_rnam)
+ else:
+ base.verbose_logger.log(logginglevels.INFO_2,"%s %s %s",
+ txt_rid, txt_rnam, _('status'))
for (rid, rname, (ui_enabled, ui_endis_wid), ui_num) in cols:
+ if arg == 'disabled': # Don't output a status column.
+ base.verbose_logger.log(logginglevels.INFO_2, "%s %s",
+ utf8_width_fill(rid, id_len),
+ utf8_width_fill(rname, nm_len,
+ nm_len))
+ continue
+
if ui_num:
ui_num = utf8_width_fill(ui_num, ui_len, left=False)
base.verbose_logger.log(logginglevels.INFO_2, "%s %s %s%s",
@@ -1009,7 +1062,7 @@ class HelpCommand(YumCommand):
return help_output
def doCommand(self, base, basecmd, extcmds):
- if base.yum_cli_commands.has_key(extcmds[0]):
+ if extcmds[0] in base.yum_cli_commands:
command = base.yum_cli_commands[extcmds[0]]
base.verbose_logger.log(logginglevels.INFO_2,
self._makeOutput(command))
@@ -1101,20 +1154,29 @@ class VersionCommand(YumCommand):
verbose = base.verbose_logger.isEnabledFor(logginglevels.DEBUG_3)
groups = {}
- gconf = yum.config.readVersionGroupsConfig()
+ if vcmd in ('nogroups', 'nogroups-installed', 'nogroups-available',
+ 'nogroups-all'):
+ gconf = []
+ if vcmd == 'nogroups':
+ vcmd = 'installed'
+ else:
+ vcmd = vcmd[len('nogroups-'):]
+ else:
+ gconf = yum.config.readVersionGroupsConfig()
+
for group in gconf:
groups[group] = set(gconf[group].pkglist)
if gconf[group].run_with_packages:
groups[group].update(base.run_with_package_names)
- if vcmd in ('grouplist'):
+ if vcmd == 'grouplist':
print _(" Yum version groups:")
for group in sorted(groups):
print " ", group
return 0, ['version grouplist']
- if vcmd in ('groupinfo'):
+ if vcmd == 'groupinfo':
for group in groups:
if group not in extcmds[1:]:
continue
@@ -1136,8 +1198,8 @@ class VersionCommand(YumCommand):
return 0, ['version groupinfo']
- rel = base.yumvar['releasever']
- ba = base.yumvar['basearch']
+ rel = base.conf.yumvar['releasever']
+ ba = base.conf.yumvar['basearch']
cols = []
if vcmd in ('installed', 'all', 'group-installed', 'group-all'):
try:
@@ -1145,9 +1207,8 @@ class VersionCommand(YumCommand):
lastdbv = base.history.last()
if lastdbv is not None:
lastdbv = lastdbv.end_rpmdbversion
- if lastdbv is not None and data[0] != lastdbv:
- errstring = _('Warning: RPMDB has been altered since the last yum transaction.')
- base.logger.warning(errstring)
+ if lastdbv is None or data[0] != lastdbv:
+ base._rpmdb_warn_checks(warn=lastdbv is not None)
if vcmd not in ('group-installed', 'group-all'):
cols.append(("%s %s/%s" % (_("Installed:"), rel, ba),
str(data[0])))
@@ -1271,3 +1332,31 @@ class HistoryCommand(YumCommand):
if extcmds:
vcmd = extcmds[0]
return vcmd in ('repeat', 'redo', 'undo')
+
+
+class CheckRpmdbCommand(YumCommand):
+ def getNames(self):
+ return ['check', 'check-rpmdb']
+
+ def getUsage(self):
+ return "[dependencies|duplicates|all]"
+
+ def getSummary(self):
+ return _("Check for problems in the rpmdb")
+
+ def doCommand(self, base, basecmd, extcmds):
+ chkcmd = 'all'
+ if extcmds:
+ chkcmd = extcmds[0]
+
+ def _out(x):
+ print x
+
+ rc = 0
+ if base._rpmdb_warn_checks(_out, False, chkcmd):
+ rc = 1
+ return rc, ['%s %s' % (basecmd, chkcmd)]
+
+ def needTs(self, base, basecmd, extcmds):
+ return False
+
diff --git a/yummain.py b/yummain.py
index b2a09cc..305e0c7 100755
--- a/yummain.py
+++ b/yummain.py
@@ -28,10 +28,10 @@ from yum import Errors
from yum import plugins
from yum import logginglevels
from yum import _
-from yum.i18n import to_unicode
+from yum.i18n import to_unicode, utf8_width
import yum.misc
import cli
-from utils import suppress_keyboard_interrupt_message
+from utils import suppress_keyboard_interrupt_message, show_lock_owner
def main(args):
"""This does all the real work"""
@@ -75,77 +75,6 @@ def main(args):
return 200
return 0
- def jiffies_to_seconds(jiffies):
- Hertz = 100 # FIXME: Hack, need to get this, AT_CLKTCK elf note *sigh*
- return int(jiffies) / Hertz
- def seconds_to_ui_time(seconds):
- if seconds >= 60 * 60 * 24:
- return "%d day(s) %d:%02d:%02d" % (seconds / (60 * 60 * 24),
- (seconds / (60 * 60)) % 24,
- (seconds / 60) % 60,
- seconds % 60)
- if seconds >= 60 * 60:
- return "%d:%02d:%02d" % (seconds / (60 * 60), (seconds / 60) % 60,
- (seconds % 60))
- return "%02d:%02d" % ((seconds / 60), seconds % 60)
- def show_lock_owner(pid):
- if not pid:
- return
-
- # Maybe true if /proc isn't mounted, or not Linux ... or something.
- if (not os.path.exists("/proc/%d/status" % pid) or
- not os.path.exists("/proc/stat") or
- not os.path.exists("/proc/%d/stat" % pid)):
- return
-
- ps = {}
- for line in open("/proc/%d/status" % pid):
- if line[-1] != '\n':
- continue
- data = line[:-1].split(':\t', 1)
- if len(data) < 2:
- continue
- if data[1].endswith(' kB'):
- data[1] = data[1][:-3]
- ps[data[0].strip().lower()] = data[1].strip()
- if 'vmrss' not in ps:
- return
- if 'vmsize' not in ps:
- return
- boot_time = None
- for line in open("/proc/stat"):
- if line.startswith("btime "):
- boot_time = int(line[len("btime "):-1])
- break
- if boot_time is None:
- return
- ps_stat = open("/proc/%d/stat" % pid).read().split()
- ps['utime'] = jiffies_to_seconds(ps_stat[13])
- ps['stime'] = jiffies_to_seconds(ps_stat[14])
- ps['cutime'] = jiffies_to_seconds(ps_stat[15])
- ps['cstime'] = jiffies_to_seconds(ps_stat[16])
- ps['start_time'] = boot_time + jiffies_to_seconds(ps_stat[21])
- ps['state'] = {'R' : _('Running'),
- 'S' : _('Sleeping'),
- 'D' : _('Uninteruptable'),
- 'Z' : _('Zombie'),
- 'T' : _('Traced/Stopped')
- }.get(ps_stat[2], _('Unknown'))
-
- # This yumBackend isn't very friendly, so...
- if ps['name'] == 'yumBackend.py':
- nmsg = _(" The other application is: PackageKit")
- else:
- nmsg = _(" The other application is: %s") % ps['name']
-
- logger.critical("%s", nmsg)
- logger.critical(_(" Memory : %5s RSS (%5sB VSZ)") %
- (base.format_number(int(ps['vmrss']) * 1024),
- base.format_number(int(ps['vmsize']) * 1024)))
- ago = seconds_to_ui_time(int(time.time()) - ps['start_time'])
- logger.critical(_(" Started: %s - %s ago") %
- (time.ctime(ps['start_time']), ago))
- logger.critical(_(" State : %s, pid: %d") % (ps['state'], pid))
logger = logging.getLogger("yum.main")
verbose_logger = logging.getLogger("yum.verbose.main")
@@ -171,7 +100,7 @@ def main(args):
lockerr = "%s" %(e.msg,)
logger.critical(lockerr)
logger.critical(_("Another app is currently holding the yum lock; waiting for it to exit..."))
- show_lock_owner(e.pid)
+ show_lock_owner(e.pid, logger)
time.sleep(2)
else:
break
@@ -237,13 +166,13 @@ def main(args):
elif result == 1:
# Fatal error
for msg in resultmsgs:
- logger.critical(_('Error: %s'), msg)
+ prefix = _('Error: %s')
+ prefix2nd = (' ' * (utf8_width(prefix) - 2))
+ logger.critical(prefix, msg.replace('\n', '\n' + prefix2nd))
if not base.conf.skip_broken:
verbose_logger.info(_(" You could try using --skip-broken to work around the problem"))
- verbose_logger.info(_(" You could try running: package-cleanup --problems\n"
- " package-cleanup --dupes\n"
- " rpm -Va --nofiles --nodigest"))
- base.yumUtilsMsg(verbose_logger.info, "package-cleanup")
+ if not base._rpmdb_warn_checks(out=verbose_logger.info, warn=False):
+ verbose_logger.info(_(" You could try running: rpm -Va --nofiles --nodigest"))
if unlock(): return 200
return 1
elif result == 2:
@@ -270,7 +199,17 @@ def main(args):
except IOError, e:
return exIOError(e)
- verbose_logger.log(logginglevels.INFO_2, _('Complete!'))
+ # rpm_check_debug failed.
+ if type(return_code) == type((0,)) and len(return_code) == 2:
+ (result, resultmsgs) = return_code
+ for msg in resultmsgs:
+ logger.critical("%s", msg)
+ if not base._rpmdb_warn_checks(out=verbose_logger.info, warn=False):
+ verbose_logger.info(_(" You could try running: rpm -Va --nofiles --nodigest"))
+ return_code = result
+ else:
+ verbose_logger.log(logginglevels.INFO_2, _('Complete!'))
+
if unlock(): return 200
return return_code