[yum-git] 2 commits - po/da.po po/nb.po po/ru.po po/yum.pot yum/plugins.py
Tim Lauridsen
timlau at linux.duke.edu
Fri Feb 8 09:29:39 UTC 2008
po/da.po | 71 +++++++++++++++++++++++++++++++++++++++++------
po/nb.po | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++------
po/ru.po | 54 +++++++++++++++++++++++++++++++++++
po/yum.pot | 54 +++++++++++++++++++++++++++++++++++
yum/plugins.py | 23 +++++++--------
5 files changed, 258 insertions(+), 30 deletions(-)
New commits:
commit eebc56af0ec9431979a58949951ce997abbbd300
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Fri Feb 8 10:24:24 2008 +0100
updates pot & po files, updating danish translation
diff --git a/po/da.po b/po/da.po
index 6305857..3a5e0a1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: yum 3.2.10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-07 14:11+0100\n"
-"PO-Revision-Date: 2008-02-08 10:06+0100\n"
+"POT-Creation-Date: 2008-02-08 10:16+0100\n"
+"PO-Revision-Date: 2008-02-08 10:23+0100\n"
"Last-Translator: Tim Lauridsen <timlau at fedoraproject.org>\n"
"Language-Team: Danish <dansk at klid.dk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#: ../callback.py:48 ../output.py:487
msgid "Updating"
@@ -403,7 +403,6 @@ msgid "skip packages with depsolving problems"
msgstr "Drop pakker med afhængigheds problemmer"
#: ../output.py:229
-#, fuzzy
msgid "Jan"
msgstr "Jan"
@@ -1678,7 +1677,9 @@ msgstr "Undersøger %s: %s"
msgid ""
"Package %s not installed, cannot update it. Run yum install to install it "
"instead."
-msgstr "Pakken %s er ikke installeret, så den kan ikke opdateret. Kør 'yum install' for at installer den"
+msgstr ""
+"Pakken %s er ikke installeret, så den kan ikke opdateret. Kør 'yum install' "
+"for at installer den"
#: ../yum/__init__.py:2411
#, python-format
@@ -1752,10 +1753,9 @@ msgid ""
"are not correct for this package.\n"
"Check that the correct key URLs are configured for this repository."
msgstr ""
-"GPG Nøglen angivet for \"%s\" kilden er allerede installet men "
-"den er ikke korrekt for denne pakke.\n"
+"GPG Nøglen angivet for \"%s\" kilden er allerede installet men den er ikke "
+"korrekt for denne pakke.\n"
"Check af konfigurationen af nøgle URL'er er korrekt for denne kilde."
-""
#: ../yum/__init__.py:2577
msgid "Import of key(s) didn't help, wrong key(s)?"
@@ -1783,6 +1783,58 @@ msgstr "Pakken %s behøver %s, som ikke er tilgængelig."
msgid "Package %s conflicts with %s."
msgstr "Pakken %s konflikter med %s."
+#: ../yum/plugins.py:168
+#, python-format
+msgid "Running \"%s\" handler for \"%s\" plugin"
+msgstr "Kører \"%s\" handler for \"%s\" plugin"
+
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:193
+msgid "Loaded plugins: "
+msgstr "Indlæser plugins: "
+
+#: ../yum/plugins.py:210
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr "\"%s\" plugin er deaktiveret"
+
+#: ../yum/plugins.py:222
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr "Plugin \"%s\" angiver ikke hvilken API version som det behøver"
+
+#: ../yum/plugins.py:226
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr "Plugin \"%s\" behøver API %s. Understøttet API er %s."
+
+#: ../yum/plugins.py:253
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr "Indlæsser \"%s\" plugin"
+
+#: ../yum/plugins.py:260
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr "En eller flere plugins med navnet \"%s\" er fundet i plugin søgstien"
+
+#: ../yum/plugins.py:280
+#, python-format
+msgid "Configuration file %s not found"
+msgstr "Konfigurations filen %s er ikke fundet"
+
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:283
+#, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr "Kunne ikke finde konfigurations filen for følgende plugin: %s"
+
+#: ../yum/plugins.py:437
+msgid "registration of commands not supported"
+msgstr "Registring af kommando linie komandoer er ikke supporteret"
+
#: ../rpmUtils/oldUtils.py:26
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
@@ -1795,7 +1847,8 @@ msgstr "RPM %s fejlede md5 checksum"
#: ../rpmUtils/oldUtils.py:144
msgid "Could not open RPM database for reading. Perhaps it is already in use?"
-msgstr "Kan ikke åbne RPM databasen, Måske er den i brug af en anden applikation"
+msgstr ""
+"Kan ikke åbne RPM databasen, Måske er den i brug af en anden applikation"
#: ../rpmUtils/oldUtils.py:174
msgid "Got an empty Header, something has gone wrong"
diff --git a/po/nb.po b/po/nb.po
index b60685f..73838b4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum 3.2.10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-07 14:11+0100\n"
+"POT-Creation-Date: 2008-02-08 10:16+0100\n"
"PO-Revision-Date: 2008-02-07 20:02+0100\n"
"Last-Translator: Terje Røsten <terje.rosten at ntnu.no>\n"
"Language-Team: Norwegian (bokmål) <i18n-no at lister.ping.uio.no>\n"
@@ -1009,14 +1009,20 @@ msgid ""
"\n"
"\n"
"aliases: "
-msgstr "\n\naliaser:"
+msgstr ""
+"\n"
+"\n"
+"aliaser:"
#: ../yumcommands.py:712
msgid ""
"\n"
"\n"
"alias: "
-msgstr "\n\nalias:"
+msgstr ""
+"\n"
+"\n"
+"alias:"
#: ../yumcommands.py:741
msgid "Setting up Reinstall Process"
@@ -1031,19 +1037,26 @@ msgid ""
"\n"
"\n"
"Exiting on user cancel"
-msgstr "\n\nAvslutter etter ønske"
+msgstr ""
+"\n"
+"\n"
+"Avslutter etter ønske"
#: ../yummain.py:47
msgid ""
"\n"
"\n"
"Exiting on Broken Pipe"
-msgstr "\n\nAvslutter på grunn ødelagt programrør"
+msgstr ""
+"\n"
+"\n"
+"Avslutter på grunn ødelagt programrør"
#: ../yummain.py:105
msgid ""
"Another app is currently holding the yum lock; waiting for it to exit..."
-msgstr "Et annet program holder en fillås for Yum, venter til fillåsen frigjøres..."
+msgstr ""
+"Et annet program holder en fillås for Yum, venter til fillåsen frigjøres..."
#: ../yummain.py:132 ../yummain.py:171
#, python-format
@@ -1064,7 +1077,9 @@ msgstr "Løser opp i avhengigheter"
msgid ""
"\n"
"Dependencies Resolved"
-msgstr "\nAlle avhengigheter er oppløst"
+msgstr ""
+"\n"
+"Alle avhengigheter er oppløst"
#: ../yummain.py:199
msgid "Complete!"
@@ -1075,7 +1090,10 @@ msgid ""
"\n"
"\n"
"Exiting on user cancel."
-msgstr "\n\nAvslutter etter ønske"
+msgstr ""
+"\n"
+"\n"
+"Avslutter etter ønske"
#: ../yum/depsolve.py:70
msgid "doTsSetup() will go away in a future version of Yum.\n"
@@ -1765,6 +1783,58 @@ msgstr "Pakke %s trnger %s, dessverre er denne ikke tilgjengelig."
msgid "Package %s conflicts with %s."
msgstr "Pakke %s er i konflikt med %s."
+#: ../yum/plugins.py:168
+#, python-format
+msgid "Running \"%s\" handler for \"%s\" plugin"
+msgstr ""
+
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:193
+msgid "Loaded plugins: "
+msgstr ""
+
+#: ../yum/plugins.py:210
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr ""
+
+#: ../yum/plugins.py:222
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr ""
+
+#: ../yum/plugins.py:226
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr ""
+
+#: ../yum/plugins.py:253
+#, fuzzy, python-format
+msgid "Loading \"%s\" plugin"
+msgstr "Rydder opp i tillegg"
+
+#: ../yum/plugins.py:260
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+
+#: ../yum/plugins.py:280
+#, python-format
+msgid "Configuration file %s not found"
+msgstr ""
+
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:283
+#, fuzzy, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr "kunne ikke finne nyere pakke for %s"
+
+#: ../yum/plugins.py:437
+msgid "registration of commands not supported"
+msgstr ""
+
#: ../rpmUtils/oldUtils.py:26
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
diff --git a/po/ru.po b/po/ru.po
index 8ae809d..dd18234 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: yum\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-07 14:11+0100\n"
+"POT-Creation-Date: 2008-02-08 10:16+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"
@@ -1802,6 +1802,58 @@ msgstr ""
msgid "Package %s conflicts with %s."
msgstr "завиÑимоÑÑи: Ð¿Ð°ÐºÐµÑ %s конÑликÑÑÐµÑ Ñ %s"
+#: ../yum/plugins.py:168
+#, python-format
+msgid "Running \"%s\" handler for \"%s\" plugin"
+msgstr ""
+
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:193
+msgid "Loaded plugins: "
+msgstr ""
+
+#: ../yum/plugins.py:210
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr ""
+
+#: ../yum/plugins.py:222
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr ""
+
+#: ../yum/plugins.py:226
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr ""
+
+#: ../yum/plugins.py:253
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr ""
+
+#: ../yum/plugins.py:260
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+
+#: ../yum/plugins.py:280
+#, python-format
+msgid "Configuration file %s not found"
+msgstr ""
+
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:283
+#, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr ""
+
+#: ../yum/plugins.py:437
+msgid "registration of commands not supported"
+msgstr ""
+
#: ../rpmUtils/oldUtils.py:26
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
diff --git a/po/yum.pot b/po/yum.pot
index a302b39..324584d 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-08 10:09+0100\n"
+"POT-Creation-Date: 2008-02-08 10:16+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"
@@ -1718,6 +1718,58 @@ msgstr ""
msgid "Package %s conflicts with %s."
msgstr ""
+#: ../yum/plugins.py:168
+#, python-format
+msgid "Running \"%s\" handler for \"%s\" plugin"
+msgstr ""
+
+#. Mostly copied from YumOutput._outKeyValFill()
+#: ../yum/plugins.py:193
+msgid "Loaded plugins: "
+msgstr ""
+
+#: ../yum/plugins.py:210
+#, python-format
+msgid "\"%s\" plugin is disabled"
+msgstr ""
+
+#: ../yum/plugins.py:222
+#, python-format
+msgid "Plugin \"%s\" doesn't specify required API version"
+msgstr ""
+
+#: ../yum/plugins.py:226
+#, python-format
+msgid "Plugin \"%s\" requires API %s. Supported API is %s."
+msgstr ""
+
+#: ../yum/plugins.py:253
+#, python-format
+msgid "Loading \"%s\" plugin"
+msgstr ""
+
+#: ../yum/plugins.py:260
+#, python-format
+msgid ""
+"Two or more plugins with the name \"%s\" exist in the plugin search path"
+msgstr ""
+
+#: ../yum/plugins.py:280
+#, python-format
+msgid "Configuration file %s not found"
+msgstr ""
+
+#. for
+#. Configuration files for the plugin not found
+#: ../yum/plugins.py:283
+#, python-format
+msgid "Unable to find configuration file for plugin %s"
+msgstr ""
+
+#: ../yum/plugins.py:437
+msgid "registration of commands not supported"
+msgstr ""
+
#: ../rpmUtils/oldUtils.py:26
#, python-format
msgid "Header cannot be opened or does not match %s, %s."
commit 0f1772f8ac86459969fb45f54cc13aa241af7e65
Author: Tim Lauridsen <tla at rasmil.dk>
Date: Fri Feb 8 10:16:29 2008 +0100
Tilføjede _() translation wrapper til plugin.py
diff --git a/po/yum.pot b/po/yum.pot
index 08762a8..a302b39 100644
--- a/po/yum.pot
+++ b/po/yum.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-07 14:11+0100\n"
+"POT-Creation-Date: 2008-02-08 10:09+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"
diff --git a/yum/plugins.py b/yum/plugins.py
index 21f7128..bfb788b 100644
--- a/yum/plugins.py
+++ b/yum/plugins.py
@@ -31,6 +31,7 @@ import Errors
from parser import ConfigPreProcessor
from textwrap import fill
+from i18n import _
# TODO: expose rpm package sack objects to plugins (once finished)
@@ -164,7 +165,7 @@ class YumPlugins:
conduitcls = eval(conduitcls) # Convert name to class object
for modname, func in self._pluginfuncs[slotname]:
- self.verbose_logger.debug('Running "%s" handler for "%s" plugin', slotname,
+ self.verbose_logger.debug(_('Running "%s" handler for "%s" plugin'), slotname,
modname)
_, conf = self._plugins[modname]
@@ -189,7 +190,7 @@ class YumPlugins:
plugins = sorted(self._plugins)
# Mostly copied from YumOutput._outKeyValFill()
- key = "Loaded plugins: "
+ key = _("Loaded plugins: ")
val = ", ".join(plugins)
nxt = ' ' * (len(key) - 2) + ': '
self.verbose_logger.log(logginglevels.INFO_2,
@@ -206,7 +207,7 @@ class YumPlugins:
conf = self._getpluginconf(modname)
if not conf or not config.getOption(conf, 'main', 'enabled',
config.BoolOption(False)):
- self.verbose_logger.debug('"%s" plugin is disabled', modname)
+ self.verbose_logger.debug(_('"%s" plugin is disabled'), modname)
return
fp, pathname, description = imp.find_module(modname, [dir])
@@ -218,11 +219,11 @@ class YumPlugins:
# Check API version required by the plugin
if not hasattr(module, 'requires_api_version'):
raise Errors.ConfigError(
- 'Plugin "%s" doesn\'t specify required API version' % modname
+ _('Plugin "%s" doesn\'t specify required API version') % modname
)
if not apiverok(API_VERSION, module.requires_api_version):
raise Errors.ConfigError(
- 'Plugin "%s" requires API %s. Supported API is %s.' % (
+ _('Plugin "%s" requires API %s. Supported API is %s.') % (
modname,
module.requires_api_version,
API_VERSION,
@@ -249,15 +250,15 @@ class YumPlugins:
if modname in self.disabledPlugins:
return
- self.verbose_logger.log(logginglevels.DEBUG_3, 'Loading "%s" plugin',
+ self.verbose_logger.log(logginglevels.DEBUG_3, _('Loading "%s" plugin'),
modname)
# Store the plugin module and its configuration file
if not self._plugins.has_key(modname):
self._plugins[modname] = (module, conf)
else:
- raise Errors.ConfigError('Two or more plugins with the name "%s" ' \
- 'exist in the plugin search path' % modname)
+ raise Errors.ConfigError(_('Two or more plugins with the name "%s" ' \
+ 'exist in the plugin search path') % modname)
for slot in SLOTS:
funcname = slot+'_hook'
@@ -276,10 +277,10 @@ class YumPlugins:
if os.access(conffilename, os.R_OK):
# Found configuration file
break
- self.verbose_logger.log(logginglevels.INFO_2, "Configuration file %s not found" % conffilename)
+ self.verbose_logger.log(logginglevels.INFO_2, _("Configuration file %s not found") % conffilename)
else: # for
# Configuration files for the plugin not found
- self.verbose_logger.log(logginglevels.INFO_2, "Unable to find configuration file for plugin %s"
+ self.verbose_logger.log(logginglevels.INFO_2, _("Unable to find configuration file for plugin %s")
% modname)
return None
parser = ConfigParser.ConfigParser()
@@ -433,7 +434,7 @@ class ConfigPluginConduit(PluginConduit):
if hasattr(self._base, 'registerCommand'):
self._base.registerCommand(command)
else:
- raise Errors.ConfigError('registration of commands not supported')
+ raise Errors.ConfigError(_('registration of commands not supported'))
class PostConfigPluginConduit(ConfigPluginConduit):
More information about the Yum-cvs-commits
mailing list