[yum-git] cli.py po/ru.po po/yum.pot
Tim Lauridsen
timlau at linux.duke.edu
Mon Jan 28 07:03:20 UTC 2008
cli.py | 144 ++++++++++++------------
po/ru.po | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
po/yum.pot | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 680 insertions(+), 134 deletions(-)
New commits:
commit ce7f4eaf26e6a115c1b0085d803ea01f41b07e01
Author: Tim Lauridsen <tim at naboo.local>
Date: Mon Jan 28 08:00:48 2008 +0100
Added _() translation wrappers to cli.py and updated yum.pot & po files
diff --git a/cli.py b/cli.py
index 41ae338..79d9515 100644
--- a/cli.py
+++ b/cli.py
@@ -98,7 +98,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
def registerCommand(self, command):
for name in command.getNames():
if self.yum_cli_commands.has_key(name):
- raise yum.Errors.ConfigError('Command "%s" already defined' % name)
+ raise yum.Errors.ConfigError(_('Command "%s" already defined') % name)
self.yum_cli_commands[name] = command
def doRepoSetup(self, thisrepo=None, dosack=1):
@@ -110,7 +110,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if not thisrepo:
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Setting up repositories')
+ _('Setting up repositories'))
# Call parent class to do the bulk of work
# (this also ensures that reposetup plugin hook is called)
@@ -121,7 +121,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if dosack: # so we can make the dirs and grab the repomd.xml but not import the md
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Reading repository metadata in from local files')
+ _('Reading repository metadata in from local files'))
self._getSacks(thisrepo=thisrepo)
return self._repos
@@ -266,14 +266,14 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
disk[m.group(2)] = int(m.group(1))
if disk:
- summary += 'Disk Requirements:\n'
+ 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 needed on the %s filesystem.\n') % (disk[k], k)
# TODO: simplify the dependency errors?
# Fixup the summary
- summary = 'Error Summary\n-------------\n' + summary
+ summary = _('Error Summary\n-------------\n') + summary
return summary
@@ -312,7 +312,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# just make sure there's not, well, nothing to do
if len(self.tsInfo) == 0:
- self.verbose_logger.info('Trying to run the transaction but nothing to do. Exiting.')
+ self.verbose_logger.info(_('Trying to run the transaction but nothing to do. Exiting.'))
return 1
# output what will be done:
@@ -342,16 +342,16 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# confirm with user
if self._promptWanted():
if not self.userconfirm():
- self.verbose_logger.info('Exiting on user Command')
+ self.verbose_logger.info(_('Exiting on user Command'))
return 1
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Downloading Packages:')
+ _('Downloading Packages:'))
problems = self.downloadPkgs(downloadpkgs)
if len(problems) > 0:
errstring = ''
- errstring += 'Error Downloading Packages:\n'
+ errstring += _('Error Downloading Packages:\n')
for key in problems:
errors = yum.misc.unique(problems[key])
for error in errors:
@@ -364,18 +364,18 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if self.conf.rpm_check_debug:
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Running rpm_check_debug')
+ _('Running rpm_check_debug'))
msgs = self._run_rpm_check_debug()
if msgs:
- print 'ERROR with rpm_check_debug vs depsolve:'
+ print _('ERROR with rpm_check_debug vs depsolve:')
for msg in msgs:
print msg
- return 1, ['Please report this error in bugzilla']
+ return 1, [_('Please report this error in bugzilla')]
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Running Transaction Test')
+ _('Running Transaction Test'))
tsConf = {}
for feature in ['diskspacecheck']: # more to come, I'm sure
tsConf[feature] = getattr(self.conf, feature)
@@ -391,16 +391,16 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
del testcb
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Finished Transaction Test')
+ _('Finished Transaction Test'))
if len(tserrors) > 0:
- errstring = 'Transaction Check Error:\n'
+ errstring = _('Transaction Check Error:\n')
for descr in tserrors:
errstring += ' %s\n' % descr
raise yum.Errors.YumBaseError, errstring + '\n' + \
self.errorSummary(errstring)
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Transaction Test Succeeded')
+ _('Transaction Test Succeeded'))
del self.ts
# unset the sigquit handler
@@ -418,7 +418,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if self.conf.debuglevel < 2:
cb.display.output = False
- self.verbose_logger.log(yum.logginglevels.INFO_2, 'Running Transaction')
+ self.verbose_logger.log(yum.logginglevels.INFO_2, _('Running Transaction'))
self.runTransaction(cb=cb)
# close things
@@ -447,8 +447,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
elif result == 1:
if not sys.stdin.isatty() and not self.conf.assumeyes:
raise yum.Errors.YumBaseError, \
- 'Refusing to automatically import keys when running ' \
- 'unattended.\nUse "-y" to override.'
+ _('Refusing to automatically import keys when running ' \
+ 'unattended.\nUse "-y" to override.')
# the callback here expects to be able to take options which
# userconfirm really doesn't... so fake it
@@ -489,12 +489,12 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
self.install(pattern=arg)
except yum.Errors.InstallError:
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'No package %s available.', arg)
+ _('No package %s available.'), arg)
if len(self.tsInfo) > oldcount:
- return 2, ['Package(s) to install']
- return 0, ['Nothing to do']
+ return 2, [_('Package(s) to install')]
+ return 0, [_('Nothing to do')]
def updatePkgs(self, userlist, quiet=0):
@@ -524,7 +524,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
txmbrs = self.tsInfo.getMembers(pkgtup=old)
if txmbrs and txmbrs[0].output_state == TS_OBSOLETED:
- self.verbose_logger.log(yum.logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', old)
+ self.verbose_logger.log(yum.logginglevels.DEBUG_2, _('Not Updating Package that is already obsoleted: %s.%s %s:%s-%s'), old)
else:
updating_pkg = self.getPackageObject(new)
updated_pkg = self.rpmdb.searchPkgTuple(old)[0]
@@ -556,7 +556,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
updatesPo, userlist, casematch=1)
for userarg in unmatched:
if not quiet:
- self.logger.error('Could not find update match for %s' % userarg)
+ self.logger.error(_('Could not find update match for %s') % userarg)
updateMatches = yum.misc.unique(matched + exactmatch)
for po in updateMatches:
@@ -568,10 +568,10 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if len(self.tsInfo) > oldcount:
change = len(self.tsInfo) - oldcount
- msg = '%d packages marked for Update' % change
+ msg = _('%d packages marked for Update') % change
return 2, [msg]
else:
- return 0, ['No Packages marked for Update']
+ return 0, [_('No Packages marked for Update')]
@@ -607,10 +607,10 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if len(self.tsInfo) > oldcount:
change = len(self.tsInfo) - oldcount
- msg = '%d packages marked for removal' % change
+ msg = _('%d packages marked for removal') % change
return 2, [msg]
else:
- return 0, ['No Packages marked for removal']
+ return 0, [_('No Packages marked for removal')]
def localInstall(self, filelist, updateonly=0):
"""handles installs/updates of rpms provided on the filesystem in a
@@ -622,7 +622,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
# don't import the repos until we absolutely need them for depsolving
if len(filelist) == 0:
- return 0, ['No Packages Provided']
+ return 0, [_('No Packages Provided')]
installing = False
for pkg in filelist:
@@ -631,8 +631,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
installing = True
if installing:
- return 2, ['Package(s) to install']
- return 0, ['Nothing to do']
+ return 2, [_('Package(s) to install')]
+ return 0, [_('Nothing to do')]
def returnPkgLists(self, extcmds):
"""Returns packages lists based on arguments on the cli.returns a
@@ -662,7 +662,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
def _shrinklist(lst, args):
if len(lst) > 0 and len(args) > 0:
self.verbose_logger.log(yum.logginglevels.DEBUG_1,
- 'Matching packages for package list to user args')
+ _('Matching packages for package list to user args'))
exactmatch, matched, unmatched = yum.packages.parsePackages(lst, args)
return yum.misc.unique(matched + exactmatch)
else:
@@ -700,7 +700,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
total += 1
if total == 0:
- return 0, ['No Matches found']
+ return 0, [_('No Matches found')]
return 0, matching
def deplist(self, args):
@@ -749,7 +749,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
pkgresults = hdrresults = xmlresults = dbresults = []
if 'all' in userlist:
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Cleaning up Everything')
+ _('Cleaning up Everything'))
pkgcode, pkgresults = self.cleanPackages()
hdrcode, hdrresults = self.cleanHeaders()
xmlcode, xmlresults = self.cleanMetadata()
@@ -763,19 +763,19 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return code, []
if 'headers' in userlist:
- self.logger.debug('Cleaning up Headers')
+ self.logger.debug(_('Cleaning up Headers'))
hdrcode, hdrresults = self.cleanHeaders()
if 'packages' in userlist:
- self.logger.debug('Cleaning up Packages')
+ self.logger.debug(_('Cleaning up Packages'))
pkgcode, pkgresults = self.cleanPackages()
if 'metadata' in userlist:
- self.logger.debug('Cleaning up xml metadata')
+ self.logger.debug(_('Cleaning up xml metadata'))
xmlcode, xmlresults = self.cleanMetadata()
if 'dbcache' in userlist:
- self.logger.debug('Cleaning up database cache')
+ self.logger.debug(_('Cleaning up database cache'))
dbcode, dbresults = self.cleanSqlite()
if 'plugins' in userlist:
- self.logger.debug('Cleaning up plugins')
+ self.logger.debug(_('Cleaning up plugins'))
self.plugins.run('clean')
@@ -797,20 +797,20 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if len(installed) > 0:
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Installed Groups:')
+ _('Installed Groups:'))
for group in installed:
self.verbose_logger.log(yum.logginglevels.INFO_2, ' %s',
group.name)
if len(available) > 0:
self.verbose_logger.log(yum.logginglevels.INFO_2,
- 'Available Groups:')
+ _('Available Groups:'))
for group in available:
self.verbose_logger.log(yum.logginglevels.INFO_2, ' %s',
group.name)
- return 0, ['Done']
+ return 0, [_('Done')]
def returnGroupInfo(self, userlist):
"""returns complete information on a list of groups"""
@@ -819,7 +819,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if group:
self.displayPkgsInGroups(group)
else:
- self.logger.error('Warning: Group %s does not exist.', strng)
+ self.logger.error(_('Warning: Group %s does not exist.'), strng)
return 0, []
@@ -843,9 +843,9 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
pkgs_used.extend(txmbrs)
if not pkgs_used:
- return 0, ['No packages in any requested group available to install or update']
+ return 0, [_('No packages in any requested group available to install or update')]
else:
- return 2, ['%d Package(s) to Install' % len(pkgs_used)]
+ return 2, [_('%d Package(s) to Install') % len(pkgs_used)]
def removeGroups(self, grouplist):
"""Remove only packages of the named group(s). Do not recurse."""
@@ -855,15 +855,15 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
try:
txmbrs = self.groupRemove(group_string)
except yum.Errors.GroupsError:
- self.logger.critical('No group named %s exists', group_string)
+ self.logger.critical(_('No group named %s exists'), group_string)
continue
else:
pkgs_used.extend(txmbrs)
if not pkgs_used:
- return 0, ['No packages to remove from groups']
+ return 0, [_('No packages to remove from groups')]
else:
- return 2, ['%d Package(s) to remove' % len(pkgs_used)]
+ return 2, [_('%d Package(s) to remove') % len(pkgs_used)]
@@ -905,7 +905,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
if self.rpmdb.contains(po=pkg):
self.verbose_logger.log(yum.logginglevels.DEBUG_3,
- 'Package %s is already installed, skipping', pkg)
+ _('Package %s is already installed, skipping'), pkg)
return False
# everything installed that matches the name
@@ -916,7 +916,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
comparable.append(instpo)
else:
self.verbose_logger.log(yum.logginglevels.DEBUG_3,
- 'Discarding non-comparable pkg %s.%s', instpo.name, instpo.arch)
+ _('Discarding non-comparable pkg %s.%s'), instpo.name, instpo.arch)
continue
# go through each package
@@ -942,7 +942,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
return True
else: # we've not got any installed that match n or n+a
- self.verbose_logger.log(yum.logginglevels.DEBUG_1, 'No other %s installed, adding to list for potential install', pkg.name)
+ self.verbose_logger.log(yum.logginglevels.DEBUG_1, _('No other %s installed, adding to list for potential install'), pkg.name)
return True
return False
@@ -961,7 +961,7 @@ class YumOptionParser(OptionParser):
def error(self, msg):
'''This method is overridden so that error output goes to logger. '''
self.print_usage()
- self.logger.critical("Command line error: %s", msg)
+ self.logger.critical(_("Command line error: %s"), msg)
sys.exit(1)
def firstParse(self,args):
@@ -1091,53 +1091,53 @@ class YumOptionParser(OptionParser):
self.add_option("-t", "--tolerant", action="store_true",
- help="be tolerant of errors")
+ help=_("be tolerant of errors"))
self.add_option("-C", dest="cacheonly", action="store_true",
- help="run entirely from cache, don't update cache")
+ help=_("run entirely from cache, don't update cache"))
self.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
- help="config file location", metavar=' [config file]')
+ help=_("config file location"), metavar=' [config file]')
self.add_option("-R", dest="sleeptime", type='int', default=None,
- help="maximum command wait time", metavar=' [minutes]')
+ help=_("maximum command wait time"), metavar=' [minutes]')
self.add_option("-d", dest="debuglevel", default=None,
- help="debugging output level", type='int',
+ help=_("debugging output level"), type='int',
metavar=' [debug level]')
self.add_option("-e", dest="errorlevel", default=None,
- help="error output level", type='int',
+ help=_("error output level"), type='int',
metavar=' [error level]')
self.add_option("-q", "--quiet", dest="quiet", action="store_true",
- help="quiet operation")
+ help=_("quiet operation"))
self.add_option("-v", "--verbose", dest="verbose", action="store_true",
help="verbose operation")
self.add_option("-y", dest="assumeyes", action="store_true",
- help="answer yes for all questions")
+ help=_("answer yes for all questions"))
self.add_option("--version", action="store_true",
- help="show Yum version and exit")
- self.add_option("--installroot", help="set install root",
+ help=_("show Yum version and exit"))
+ self.add_option("--installroot", help=_("set install root"),
metavar='[path]')
self.add_option("--enablerepo", action='callback',
type='string', callback=repo_optcb, dest='repos', default=[],
- help="enable one or more repositories (wildcards allowed)",
+ help=_("enable one or more repositories (wildcards allowed)"),
metavar='[repo]')
self.add_option("--disablerepo", action='callback',
type='string', callback=repo_optcb, dest='repos', default=[],
- help="disable one or more repositories (wildcards allowed)",
+ help=_("disable one or more repositories (wildcards allowed)"),
metavar='[repo]')
self.add_option("-x", "--exclude", default=[], action="append",
- help="exclude package(s) by name or glob", metavar='[package]')
+ help=_("exclude package(s) by name or glob"), metavar='[package]')
self.add_option("", "--disableexcludes", default=[], action="append",
- help="disable exclude from main, for a repo or for everything",
+ help=_("disable exclude from main, for a repo or for everything"),
metavar='[repo]')
self.add_option("--obsoletes", action="store_true",
- help="enable obsoletes processing during updates")
+ help=_("enable obsoletes processing during updates"))
self.add_option("--noplugins", action="store_true",
- help="disable Yum plugins")
+ help=_("disable Yum plugins"))
self.add_option("--nogpgcheck", action="store_true",
- help="disable gpg signature checking")
+ help=_("disable gpg signature checking"))
self.add_option("", "--disableplugin", dest="disableplugins", default=[],
- action="append", help="disable plugins by name",
+ action="append", help=_("disable plugins by name"),
metavar='[plugin]')
self.add_option("--skip-broken", action="store_true", dest="skipbroken",
- help="skip packages with depsolving problems")
+ help=_("skip packages with depsolving problems"))
diff --git a/po/ru.po b/po/ru.po
index 4c64ce1..87a5980 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 19:52+0100\n"
+"POT-Creation-Date: 2008-01-28 07:59+0100\n"
"PO-Revision-Date: 2003-10-14 15:36+0400\n"
"Last-Translator: Grigory Bakunov <black at asplinux.ru>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -26,6 +26,19 @@ msgstr "Ðет заголовка - блин?"
msgid "Erased: %s"
msgstr "Удалено: "
+#: ../cli.py:101
+#, python-format
+msgid "Command \"%s\" already defined"
+msgstr ""
+
+#: ../cli.py:113
+msgid "Setting up repositories"
+msgstr ""
+
+#: ../cli.py:124
+msgid "Reading repository metadata in from local files"
+msgstr ""
+
#: ../cli.py:181 ../utils.py:57
#, fuzzy, python-format
msgid "Config Error: %s"
@@ -41,11 +54,122 @@ msgstr "Ошибка опции: %s"
msgid "You need to give some command"
msgstr "Hеобходимы привилегии ÑÑƒÐ¿ÐµÑ€Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтой команды"
+#: ../cli.py:269
+msgid "Disk Requirements:\n"
+msgstr ""
+
+#: ../cli.py:271
+#, python-format
+msgid " At least %dMB needed on the %s filesystem.\n"
+msgstr ""
+
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
+#: ../cli.py:276
+msgid ""
+"Error Summary\n"
+"-------------\n"
+msgstr ""
+
+#: ../cli.py:315
+msgid "Trying to run the transaction but nothing to do. Exiting."
+msgstr ""
+
+#: ../cli.py:345
+#, fuzzy
+msgid "Exiting on user Command"
+msgstr "Выход по требованию пользователÑ"
+
+#: ../cli.py:349
+#, fuzzy
+msgid "Downloading Packages:"
+msgstr "ПоиÑк обновленных пакетов"
+
+#: ../cli.py:354
+#, fuzzy
+msgid "Error Downloading Packages:\n"
+msgstr "Ошибка: Ðе подпиÑанный пакет %s"
+
+#: ../cli.py:367 ../yum/__init__.py:2551
+msgid "Running rpm_check_debug"
+msgstr ""
+
+#: ../cli.py:370 ../yum/__init__.py:2554
+msgid "ERROR with rpm_check_debug vs depsolve:"
+msgstr ""
+
+#: ../cli.py:374 ../yum/__init__.py:2556
+msgid "Please report this error in bugzilla"
+msgstr ""
+
+#: ../cli.py:378
+#, fuzzy
+msgid "Running Transaction Test"
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в теÑтой транзакции:"
+
+#: ../cli.py:394
+msgid "Finished Transaction Test"
+msgstr ""
+
+#: ../cli.py:396
+msgid "Transaction Check Error:\n"
+msgstr ""
+
+#: ../cli.py:403
+#, fuzzy
+msgid "Transaction Test Succeeded"
+msgstr "Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
+
+#: ../cli.py:421
+msgid "Running Transaction"
+msgstr ""
+
+#: ../cli.py:450
+msgid ""
+"Refusing to automatically import keys when running unattended.\n"
+"Use \"-y\" to override."
+msgstr ""
+
#: ../cli.py:482
#, fuzzy
msgid "Parsing package install arguments"
msgstr "Ошибка при разборе параметров командной Ñтроки: %s"
+#: ../cli.py:492
+#, fuzzy, python-format
+msgid "No package %s available."
+msgstr "Ðет доÑтупных Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра пакетов"
+
+#: ../cli.py:496 ../cli.py:634
+#, fuzzy
+msgid "Package(s) to install"
+msgstr "Ðет доÑтупных Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра пакетов"
+
+#: ../cli.py:497 ../cli.py:635
+msgid "Nothing to do"
+msgstr ""
+
+#: ../cli.py:527 ../yum/__init__.py:2085 ../yum/__init__.py:2164
+#: ../yum/__init__.py:2176
+#, python-format
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../cli.py:559
+#, fuzzy, python-format
+msgid "Could not find update match for %s"
+msgstr "Hе удаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ пакет Ñовпадающий Ñ %s"
+
+#: ../cli.py:571
+#, fuzzy, python-format
+msgid "%d packages marked for Update"
+msgstr "Ðет пакетов доÑтупных Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
+
+#: ../cli.py:574
+#, fuzzy
+msgid "No Packages marked for Update"
+msgstr "Ðет пакетов доÑтупных Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
+
#: ../cli.py:597 ../yum/__init__.py:2213
#, python-format
msgid "%s"
@@ -56,16 +180,202 @@ msgstr ""
msgid "No Match for argument: %s"
msgstr ""
+#: ../cli.py:610
+#, python-format
+msgid "%d packages marked for removal"
+msgstr ""
+
+#: ../cli.py:613
+#, fuzzy
+msgid "No Packages marked for removal"
+msgstr "Ðет пакетов доÑтупных Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
+
+#: ../cli.py:625
+#, fuzzy
+msgid "No Packages Provided"
+msgstr "Пакеты не найдены"
+
+#: ../cli.py:665
+msgid "Matching packages for package list to user args"
+msgstr ""
+
+#: ../cli.py:703
+#, fuzzy
+msgid "No Matches found"
+msgstr "Пакеты не найдены"
+
#: ../cli.py:740
#, fuzzy, python-format
msgid "No Package Found for %s"
msgstr "Пакет %s не найден"
-#: ../cli.py:834 ../cli.py:840
+#: ../cli.py:752
+msgid "Cleaning up Everything"
+msgstr ""
+
+#: ../cli.py:766
+#, fuzzy
+msgid "Cleaning up Headers"
+msgstr "Удаление Ñтарых заголовков"
+
+#: ../cli.py:769
+#, fuzzy
+msgid "Cleaning up Packages"
+msgstr "Удаление пакетов"
+
+#: ../cli.py:772
+#, fuzzy
+msgid "Cleaning up xml metadata"
+msgstr "Получение групп Ñ Ñерверов"
+
+#: ../cli.py:775
+msgid "Cleaning up database cache"
+msgstr ""
+
+#: ../cli.py:778
+msgid "Cleaning up plugins"
+msgstr ""
+
+#: ../cli.py:800
+#, fuzzy
+msgid "Installed Groups:"
+msgstr "УÑтановлено: "
+
+#: ../cli.py:807
+msgid "Available Groups:"
+msgstr ""
+
+#: ../cli.py:813
+msgid "Done"
+msgstr ""
+
+#: ../cli.py:822 ../cli.py:834 ../cli.py:840
#, fuzzy, python-format
msgid "Warning: Group %s does not exist."
msgstr "Группа %s не ÑущеÑтвует"
+#: ../cli.py:846
+#, fuzzy
+msgid "No packages in any requested group available to install or update"
+msgstr "Ðет доÑтупных Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра пакетов"
+
+#: ../cli.py:848
+#, fuzzy, python-format
+msgid "%d Package(s) to Install"
+msgstr "Ðет доÑтупных Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра пакетов"
+
+#: ../cli.py:858
+#, python-format
+msgid "No group named %s exists"
+msgstr ""
+
+#: ../cli.py:864
+#, fuzzy
+msgid "No packages to remove from groups"
+msgstr "Пакеты не найдены"
+
+#: ../cli.py:866
+#, python-format
+msgid "%d Package(s) to remove"
+msgstr ""
+
+#: ../cli.py:908
+#, fuzzy, python-format
+msgid "Package %s is already installed, skipping"
+msgstr "%s уже уÑтановлен и Ñто поÑледнÑÑ Ð²ÐµÑ€ÑиÑ."
+
+#: ../cli.py:919
+#, python-format
+msgid "Discarding non-comparable pkg %s.%s"
+msgstr ""
+
+#. we've not got any installed that match n or n+a
+#: ../cli.py:945
+#, python-format
+msgid "No other %s installed, adding to list for potential install"
+msgstr ""
+
+#: ../cli.py:964
+#, fuzzy, python-format
+msgid "Command line error: %s"
+msgstr "Ошибка опции: %s"
+
+#: ../cli.py:1094
+msgid "be tolerant of errors"
+msgstr ""
+
+#: ../cli.py:1096
+msgid "run entirely from cache, don't update cache"
+msgstr ""
+
+#: ../cli.py:1098
+msgid "config file location"
+msgstr ""
+
+#: ../cli.py:1100
+msgid "maximum command wait time"
+msgstr ""
+
+#: ../cli.py:1102
+msgid "debugging output level"
+msgstr ""
+
+#: ../cli.py:1105
+msgid "error output level"
+msgstr ""
+
+#: ../cli.py:1108
+msgid "quiet operation"
+msgstr ""
+
+#: ../cli.py:1112
+msgid "answer yes for all questions"
+msgstr ""
+
+#: ../cli.py:1114
+msgid "show Yum version and exit"
+msgstr ""
+
+#: ../cli.py:1115
+msgid "set install root"
+msgstr ""
+
+#: ../cli.py:1119
+msgid "enable one or more repositories (wildcards allowed)"
+msgstr ""
+
+#: ../cli.py:1123
+msgid "disable one or more repositories (wildcards allowed)"
+msgstr ""
+
+#: ../cli.py:1126
+msgid "exclude package(s) by name or glob"
+msgstr ""
+
+#: ../cli.py:1128
+msgid "disable exclude from main, for a repo or for everything"
+msgstr ""
+
+#: ../cli.py:1131
+msgid "enable obsoletes processing during updates"
+msgstr ""
+
+#: ../cli.py:1133
+msgid "disable Yum plugins"
+msgstr ""
+
+#: ../cli.py:1135
+msgid "disable gpg signature checking"
+msgstr ""
+
+#: ../cli.py:1137
+msgid "disable plugins by name"
+msgstr ""
+
+#: ../cli.py:1140
+msgid "skip packages with depsolving problems"
+msgstr ""
+
#: ../output.py:267
#, python-format
msgid "Name : %s"
@@ -712,11 +1022,6 @@ msgstr "%s уже уÑтановлен и Ñто поÑледнÑÑ Ð²ÐµÑ€ÑиÑ
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:2085 ../yum/__init__.py:2164 ../yum/__init__.py:2176
-#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr ""
-
#: ../yum/__init__.py:2157
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
@@ -822,18 +1127,6 @@ msgstr ""
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:2551
-msgid "Running rpm_check_debug"
-msgstr ""
-
-#: ../yum/__init__.py:2554
-msgid "ERROR with rpm_check_debug vs depsolve:"
-msgstr ""
-
-#: ../yum/__init__.py:2556
-msgid "Please report this error in bugzilla"
-msgstr ""
-
#: ../yum/__init__.py:2579
msgid "Test Transaction Errors: "
msgstr ""
@@ -924,9 +1217,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ "параметры lilo не поддерживаютÑÑ yum. Будет иÑпользованы параметры из "
#~ "lilo.conf. Файл lilo.conf оÑтанетÑÑ Ð½ÐµÐ¸Ð·Ð¼ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼. Параметры включают:\n"
-#~ msgid "Installed: "
-#~ msgstr "УÑтановлено: "
-
#~ msgid "Error getting file %s"
#~ msgstr "Ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°: %s"
@@ -975,9 +1265,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Found %s."
#~ msgstr "Ðайден %s."
-#~ msgid "Transaction(s) Complete"
-#~ msgstr "Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð°"
-
#~ msgid "IOError: %s"
#~ msgstr "ВВОшибка: %s"
@@ -1114,9 +1401,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Putting back old headers"
#~ msgstr "Возврат Ñтарых заголовков"
-#~ msgid "Exiting on user command."
-#~ msgstr "Выход по требованию пользователÑ"
-
#~ msgid ""
#~ "Error: You may need to disable gpg checking to install this package\n"
#~ msgstr ""
@@ -1224,9 +1508,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Attempt to delete a missing file %s - ignoring."
#~ msgstr "Попытка удалить неÑущеÑтвующий файл %s - игнорируетÑÑ."
-#~ msgid "Unknown error testing transaction set:"
-#~ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в теÑтой транзакции:"
-
#~ msgid "Exiting on User Cancel"
#~ msgstr "Выход по требованию пользователÑ"
@@ -1249,9 +1530,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Using cached header.info file"
#~ msgstr "ИÑпользуетÑÑ ÐºÑшированный header.info"
-#~ msgid "Error: Unsigned Package %s"
-#~ msgstr "Ошибка: Ðе подпиÑанный пакет %s"
-
#~ msgid "localrpmdb not defined"
#~ msgstr "localrpmdb не задана"
@@ -1293,9 +1571,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "No rpms to work with and no header dir. Exiting."
#~ msgstr "Ðе найдено пакетов и каталога заголовков. Завершение."
-#~ msgid "Cleaning old headers"
-#~ msgstr "Удаление Ñтарых заголовков"
-
#~ msgid "using cached groups from server: %s"
#~ msgstr "иÑпользование кÑшированных групп Ñ Ñервера: %s"
@@ -1305,9 +1580,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Removing dumb arch for install only pkg: %s"
#~ msgstr "Удаление пуÑтой архитектуры Ð´Ð»Ñ ÑƒÑтановки пакета: %s"
-#~ msgid "No packages found"
-#~ msgstr "Пакеты не найдены"
-
#~ msgid "Exiting."
#~ msgstr "Завершение."
@@ -1400,9 +1672,6 @@ msgstr "Ðевозможно открыть пакет %s - ошибка %s"
#~ msgid "Nothing in any group to update or install"
#~ msgstr "Ðечего обновлÑÑ‚ÑŒ или уÑтанавливать"
-#~ msgid "No Packages Available for Update"
-#~ msgstr "Ðет пакетов доÑтупных Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ"
-
#~ msgid "Grub found - making this kernel the default"
#~ msgstr "Обнаружен Grub - Ñдро уÑтанавливаетÑÑ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¼ по умолчанию"
diff --git a/po/yum.pot b/po/yum.pot
index f60af25..9409f75 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-27 19:52+0100\n"
+"POT-Creation-Date: 2008-01-28 07:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,6 +26,19 @@ msgstr ""
msgid "Erased: %s"
msgstr ""
+#: ../cli.py:101
+#, python-format
+msgid "Command \"%s\" already defined"
+msgstr ""
+
+#: ../cli.py:113
+msgid "Setting up repositories"
+msgstr ""
+
+#: ../cli.py:124
+msgid "Reading repository metadata in from local files"
+msgstr ""
+
#: ../cli.py:181 ../utils.py:57
#, python-format
msgid "Config Error: %s"
@@ -40,10 +53,114 @@ msgstr ""
msgid "You need to give some command"
msgstr ""
+#: ../cli.py:269
+msgid "Disk Requirements:\n"
+msgstr ""
+
+#: ../cli.py:271
+#, python-format
+msgid " At least %dMB needed on the %s filesystem.\n"
+msgstr ""
+
+#. TODO: simplify the dependency errors?
+#. Fixup the summary
+#: ../cli.py:276
+msgid ""
+"Error Summary\n"
+"-------------\n"
+msgstr ""
+
+#: ../cli.py:315
+msgid "Trying to run the transaction but nothing to do. Exiting."
+msgstr ""
+
+#: ../cli.py:345
+msgid "Exiting on user Command"
+msgstr ""
+
+#: ../cli.py:349
+msgid "Downloading Packages:"
+msgstr ""
+
+#: ../cli.py:354
+msgid "Error Downloading Packages:\n"
+msgstr ""
+
+#: ../cli.py:367 ../yum/__init__.py:2551
+msgid "Running rpm_check_debug"
+msgstr ""
+
+#: ../cli.py:370 ../yum/__init__.py:2554
+msgid "ERROR with rpm_check_debug vs depsolve:"
+msgstr ""
+
+#: ../cli.py:374 ../yum/__init__.py:2556
+msgid "Please report this error in bugzilla"
+msgstr ""
+
+#: ../cli.py:378
+msgid "Running Transaction Test"
+msgstr ""
+
+#: ../cli.py:394
+msgid "Finished Transaction Test"
+msgstr ""
+
+#: ../cli.py:396
+msgid "Transaction Check Error:\n"
+msgstr ""
+
+#: ../cli.py:403
+msgid "Transaction Test Succeeded"
+msgstr ""
+
+#: ../cli.py:421
+msgid "Running Transaction"
+msgstr ""
+
+#: ../cli.py:450
+msgid ""
+"Refusing to automatically import keys when running unattended.\n"
+"Use \"-y\" to override."
+msgstr ""
+
#: ../cli.py:482
msgid "Parsing package install arguments"
msgstr ""
+#: ../cli.py:492
+#, python-format
+msgid "No package %s available."
+msgstr ""
+
+#: ../cli.py:496 ../cli.py:634
+msgid "Package(s) to install"
+msgstr ""
+
+#: ../cli.py:497 ../cli.py:635
+msgid "Nothing to do"
+msgstr ""
+
+#: ../cli.py:527 ../yum/__init__.py:2085 ../yum/__init__.py:2164
+#: ../yum/__init__.py:2176
+#, python-format
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../cli.py:559
+#, python-format
+msgid "Could not find update match for %s"
+msgstr ""
+
+#: ../cli.py:571
+#, python-format
+msgid "%d packages marked for Update"
+msgstr ""
+
+#: ../cli.py:574
+msgid "No Packages marked for Update"
+msgstr ""
+
#: ../cli.py:597 ../yum/__init__.py:2213
#, python-format
msgid "%s"
@@ -54,16 +171,193 @@ msgstr ""
msgid "No Match for argument: %s"
msgstr ""
+#: ../cli.py:610
+#, python-format
+msgid "%d packages marked for removal"
+msgstr ""
+
+#: ../cli.py:613
+msgid "No Packages marked for removal"
+msgstr ""
+
+#: ../cli.py:625
+msgid "No Packages Provided"
+msgstr ""
+
+#: ../cli.py:665
+msgid "Matching packages for package list to user args"
+msgstr ""
+
+#: ../cli.py:703
+msgid "No Matches found"
+msgstr ""
+
#: ../cli.py:740
#, python-format
msgid "No Package Found for %s"
msgstr ""
-#: ../cli.py:834 ../cli.py:840
+#: ../cli.py:752
+msgid "Cleaning up Everything"
+msgstr ""
+
+#: ../cli.py:766
+msgid "Cleaning up Headers"
+msgstr ""
+
+#: ../cli.py:769
+msgid "Cleaning up Packages"
+msgstr ""
+
+#: ../cli.py:772
+msgid "Cleaning up xml metadata"
+msgstr ""
+
+#: ../cli.py:775
+msgid "Cleaning up database cache"
+msgstr ""
+
+#: ../cli.py:778
+msgid "Cleaning up plugins"
+msgstr ""
+
+#: ../cli.py:800
+msgid "Installed Groups:"
+msgstr ""
+
+#: ../cli.py:807
+msgid "Available Groups:"
+msgstr ""
+
+#: ../cli.py:813
+msgid "Done"
+msgstr ""
+
+#: ../cli.py:822 ../cli.py:834 ../cli.py:840
#, python-format
msgid "Warning: Group %s does not exist."
msgstr ""
+#: ../cli.py:846
+msgid "No packages in any requested group available to install or update"
+msgstr ""
+
+#: ../cli.py:848
+#, python-format
+msgid "%d Package(s) to Install"
+msgstr ""
+
+#: ../cli.py:858
+#, python-format
+msgid "No group named %s exists"
+msgstr ""
+
+#: ../cli.py:864
+msgid "No packages to remove from groups"
+msgstr ""
+
+#: ../cli.py:866
+#, python-format
+msgid "%d Package(s) to remove"
+msgstr ""
+
+#: ../cli.py:908
+#, python-format
+msgid "Package %s is already installed, skipping"
+msgstr ""
+
+#: ../cli.py:919
+#, python-format
+msgid "Discarding non-comparable pkg %s.%s"
+msgstr ""
+
+#. we've not got any installed that match n or n+a
+#: ../cli.py:945
+#, python-format
+msgid "No other %s installed, adding to list for potential install"
+msgstr ""
+
+#: ../cli.py:964
+#, python-format
+msgid "Command line error: %s"
+msgstr ""
+
+#: ../cli.py:1094
+msgid "be tolerant of errors"
+msgstr ""
+
+#: ../cli.py:1096
+msgid "run entirely from cache, don't update cache"
+msgstr ""
+
+#: ../cli.py:1098
+msgid "config file location"
+msgstr ""
+
+#: ../cli.py:1100
+msgid "maximum command wait time"
+msgstr ""
+
+#: ../cli.py:1102
+msgid "debugging output level"
+msgstr ""
+
+#: ../cli.py:1105
+msgid "error output level"
+msgstr ""
+
+#: ../cli.py:1108
+msgid "quiet operation"
+msgstr ""
+
+#: ../cli.py:1112
+msgid "answer yes for all questions"
+msgstr ""
+
+#: ../cli.py:1114
+msgid "show Yum version and exit"
+msgstr ""
+
+#: ../cli.py:1115
+msgid "set install root"
+msgstr ""
+
+#: ../cli.py:1119
+msgid "enable one or more repositories (wildcards allowed)"
+msgstr ""
+
+#: ../cli.py:1123
+msgid "disable one or more repositories (wildcards allowed)"
+msgstr ""
+
+#: ../cli.py:1126
+msgid "exclude package(s) by name or glob"
+msgstr ""
+
+#: ../cli.py:1128
+msgid "disable exclude from main, for a repo or for everything"
+msgstr ""
+
+#: ../cli.py:1131
+msgid "enable obsoletes processing during updates"
+msgstr ""
+
+#: ../cli.py:1133
+msgid "disable Yum plugins"
+msgstr ""
+
+#: ../cli.py:1135
+msgid "disable gpg signature checking"
+msgstr ""
+
+#: ../cli.py:1137
+msgid "disable plugins by name"
+msgstr ""
+
+#: ../cli.py:1140
+msgid "skip packages with depsolving problems"
+msgstr ""
+
#: ../output.py:267
#, python-format
msgid "Name : %s"
@@ -698,11 +992,6 @@ msgstr ""
msgid "Updating Everything"
msgstr ""
-#: ../yum/__init__.py:2085 ../yum/__init__.py:2164 ../yum/__init__.py:2176
-#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
-msgstr ""
-
#: ../yum/__init__.py:2157
#, python-format
msgid "Package is already obsoleted: %s.%s %s:%s-%s"
@@ -807,18 +1096,6 @@ msgstr ""
msgid "Errors were encountered while downloading packages."
msgstr ""
-#: ../yum/__init__.py:2551
-msgid "Running rpm_check_debug"
-msgstr ""
-
-#: ../yum/__init__.py:2554
-msgid "ERROR with rpm_check_debug vs depsolve:"
-msgstr ""
-
-#: ../yum/__init__.py:2556
-msgid "Please report this error in bugzilla"
-msgstr ""
-
#: ../yum/__init__.py:2579
msgid "Test Transaction Errors: "
msgstr ""
More information about the Yum-cvs-commits
mailing list