summaryrefslogtreecommitdiff
path: root/portato/plugin.py
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2010-04-11 16:14:13 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2010-04-11 16:14:13 +0200
commit1f7f06f92bb910a0b1e025055b252478e5727fb3 (patch)
treee17f2fcccf67ee6b708fa3cf325775120bd44c5e /portato/plugin.py
parentd9a7cd1da64da57bea05e5b234b9d9c6fea7f911 (diff)
parentf60043617196af00df43d2083c7bc318f5c8ef4d (diff)
downloadportato-1f7f06f92bb910a0b1e025055b252478e5727fb3.tar.gz
portato-1f7f06f92bb910a0b1e025055b252478e5727fb3.tar.bz2
portato-1f7f06f92bb910a0b1e025055b252478e5727fb3.zip
Merge branch '0.14'
Conflicts: portato/plugin.py
Diffstat (limited to '')
-rw-r--r--portato/plugin.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/portato/plugin.py b/portato/plugin.py
index 73db92b..cfe3d93 100644
--- a/portato/plugin.py
+++ b/portato/plugin.py
@@ -441,10 +441,10 @@ class PluginQueue (object):
try:
exec("from portato.plugins import %s" % p, {})
except PluginLoadException as e:
- error(_("Loading plugin module '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : e})
+ error(_("Loading plugin '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : e})
except:
tb = traceback.format_exc()
- error(_("Loading plugin module '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : tb})
+ error(_("Loading plugin '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : tb})
self._organize()
@@ -454,7 +454,7 @@ class PluginQueue (object):
try:
p._widget_init(window)
except PluginLoadException as e:
- error(_("Loading widgets plugin '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : e})
+ error(_("Loading plugin '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : e})
except:
tb = traceback.format_exc()
error(_("Loading widgets of plugin '%(plugin)s' failed: %(error)s"), {"plugin" : p, "error" : tb})