summaryrefslogtreecommitdiff
path: root/portato
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
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 'portato')
-rw-r--r--portato/gui/templates/AboutWindow.ui2
-rw-r--r--portato/gui/templates/MainWindow.ui2
-rw-r--r--portato/gui/templates/PreferenceWindow.ui4
-rw-r--r--portato/gui/views.py2
-rw-r--r--portato/plugin.py6
5 files changed, 8 insertions, 8 deletions
diff --git a/portato/gui/templates/AboutWindow.ui b/portato/gui/templates/AboutWindow.ui
index a3f81cf..893958a 100644
--- a/portato/gui/templates/AboutWindow.ui
+++ b/portato/gui/templates/AboutWindow.ui
@@ -18,7 +18,7 @@
<property name="copyright">This software is licensed under the terms of the GPLv2.
Copyright (C) 2006-2010 Ren&#xE9; 'Necoro' Neumann &lt;necoro@necoro.net&gt;</property>
<property name="comments">A Portage GUI</property>
- <property name="website">http://portato.necoro.net</property>
+ <property name="website">http://www.necoro.eu/portato</property>
<property name="authors">Ren&#xE9; 'Necoro' Neumann
Thanks goto:
diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui
index 05e9545..2eaaae1 100644
--- a/portato/gui/templates/MainWindow.ui
+++ b/portato/gui/templates/MainWindow.ui
@@ -644,7 +644,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Execute the current selected queue</property>
+ <property name="tooltip_text" translatable="yes">Execute the currently selected queue</property>
<signal name="clicked" handler="cb_execute_clicked"/>
<child>
<object class="GtkHBox" id="hbox7">
diff --git a/portato/gui/templates/PreferenceWindow.ui b/portato/gui/templates/PreferenceWindow.ui
index d2135d0..0f0a16f 100644
--- a/portato/gui/templates/PreferenceWindow.ui
+++ b/portato/gui/templates/PreferenceWindow.ui
@@ -622,7 +622,7 @@
<child type="tab">
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
- <property name="label" translatable="yes">Portage</property>
+ <property name="label">Portage</property>
</object>
<packing>
<property name="position">1</property>
@@ -931,7 +931,7 @@ As an example: &lt;i&gt;app-admin&lt;/i&gt;, &lt;i&gt;app-emacs&lt;/i&gt;, and &
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="title" translatable="yes">Chose a console font</property>
+ <property name="title" translatable="yes">Choose a console font</property>
<property name="use_font">True</property>
<property name="use_size">True</property>
<property name="show_style">False</property>
diff --git a/portato/gui/views.py b/portato/gui/views.py
index ed05853..5abf081 100644
--- a/portato/gui/views.py
+++ b/portato/gui/views.py
@@ -108,7 +108,7 @@ class HighlightView (gtksourceview2.View, LazyView):
old_lang = lang
if not language and old_lang:
- warning(_("No %(old)s language file installed. Disable highlighting."), {"old" : old_lang})
+ warning(_("No %(old)s language file installed. Disabling highlighting."), {"old" : old_lang})
buf = gtksourceview2.Buffer()
buf.set_language(language)
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})