[kupfer] plugin.clawsmail, .., zim: Review strings

[Ulrik Sverdrup <usverdrup src gnome org>]

commit df0d8655c1f0ce842e72c6326ededf2492db4d42
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Thu Oct 8 00:02:00 2009 +0200

    plugin.clawsmail, .., zim: Review strings

 kupfer/plugin/clawsmail.py |    4 ++--
 kupfer/plugin/gajim.py     |    2 +-
 kupfer/plugin/putty.py     |    7 ++++---
 kupfer/plugin/services.py  |    2 +-
 kupfer/plugin/tsclient.py  |    7 ++++---
 kupfer/plugin/zim.py       |    7 ++++---
 6 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/kupfer/plugin/clawsmail.py b/kupfer/plugin/clawsmail.py
index 8bb0ed5..6b67200 100644
--- a/kupfer/plugin/clawsmail.py
+++ b/kupfer/plugin/clawsmail.py
@@ -74,7 +74,7 @@ class ReceiveMail(RunnableLeaf):
 class NewMailAction(Action):
 	''' Createn new mail to selected leaf (ClawsContact or TextLeaf)'''
 	def __init__(self):
-		Action.__init__(self, _('Compose New Mail to'))
+		Action.__init__(self, _('Compose New Mail To'))
 
 	def activate(self, leaf):
 		email = leaf.object
@@ -151,7 +151,7 @@ class ClawsContactsSource(AppLeafContentMixin, Source, FilesystemWatchMixin):
 		yield ReceiveMail()
 
 	def get_description(self):
-		return _("Contacts from Claw Mail Address Book")
+		return _("Contacts from Claws Mail Address Book")
 
 	def get_icon_name(self):
 		return "claws-mail"
diff --git a/kupfer/plugin/gajim.py b/kupfer/plugin/gajim.py
index 3e1293f..c188001 100644
--- a/kupfer/plugin/gajim.py
+++ b/kupfer/plugin/gajim.py
@@ -90,7 +90,7 @@ class ChangeStatus(Action):
 	rank_adjust = 5
 
 	def __init__(self):
-		Action.__init__(self, _('Change Gajim global Status...'))
+		Action.__init__(self, _('Change Global Status To...'))
 
 	def activate(self, leaf, iobj):
 		interface = _create_dbus_connection((iobj.object != 'offline'))
diff --git a/kupfer/plugin/putty.py b/kupfer/plugin/putty.py
index 440bfec..7e05177 100644
--- a/kupfer/plugin/putty.py
+++ b/kupfer/plugin/putty.py
@@ -36,7 +36,7 @@ class PuttySession(Leaf):
 class PuttyOpenSession(Action):
 	''' opens putty session '''
 	def __init__(self):
-		Action.__init__(self, _('Start PuTTY Session'))
+		Action.__init__(self, _('Start Session'))
 
 	def activate(self, leaf):
 		utils.launch_commandline("putty -load '%s'" % leaf.object)
@@ -74,7 +74,7 @@ class PuttySessionSource(AppLeafContentMixin, Source, PicklingHelperMixin,
 				yield PuttySession(name, description)
 
 	def get_description(self):
-		return _("Session saved in Putty")
+		return None
 
 	def get_icon_name(self):
 		return "putty"
@@ -99,7 +99,8 @@ class PuttySessionSource(AppLeafContentMixin, Source, PicklingHelperMixin,
 
 		else:
 			if host:
-				return unicode(user + '@' + host if user else host)
+				return unicode(user + '@' + host if user else host, "UTF-8",
+						"replace")
 
 		return u'PuTTY Session'
 
diff --git a/kupfer/plugin/services.py b/kupfer/plugin/services.py
index 07f7675..c412fe8 100644
--- a/kupfer/plugin/services.py
+++ b/kupfer/plugin/services.py
@@ -8,7 +8,7 @@ from kupfer import utils
 
 __kupfer_name__ = _("System Services")
 __kupfer_sources__ = ("SystemServicesSource", )
-__description__ = _("Start/stop/restart System Services via scripts in /etc/*/init.d/ and *sudo")
+__description__ = _("Start, stop or restart system services via init scripts")
 __version__ = "0.2"
 __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 __kupfer_settings__ = plugin_support.PluginSettings(
diff --git a/kupfer/plugin/tsclient.py b/kupfer/plugin/tsclient.py
index 60cd117..b0788b8 100644
--- a/kupfer/plugin/tsclient.py
+++ b/kupfer/plugin/tsclient.py
@@ -36,7 +36,7 @@ class TsclientSession(Leaf):
 class TsclientOpenSession(Action):
 	''' opens tsclient session '''
 	def __init__(self):
-		Action.__init__(self, _('Start Terminal Server Session'))
+		Action.__init__(self, _('Start Session'))
 
 	def activate(self, leaf):
 		utils.launch_commandline("tsclient -x '%s'" % leaf.object)
@@ -80,7 +80,7 @@ class TsclientSessionSource(AppLeafContentMixin, Source, PicklingHelperMixin,
 				yield TsclientSession(obj_path, name, description)
 
 	def get_description(self):
-		return _("Session saved in Terminal Server Client")
+		return _("Saved sessions in Terminal Server Client")
 
 	def get_icon_name(self):
 		return "tsclient"
@@ -105,7 +105,8 @@ class TsclientSessionSource(AppLeafContentMixin, Source, PicklingHelperMixin,
 
 		else:
 			if host:
-				return unicode(user + '@' + host if user else host)
+				return unicode(user + '@' + host if user else host, "UTF-8",
+						"replace")
 
 		return u'Terminal Server Client Session'
 
diff --git a/kupfer/plugin/zim.py b/kupfer/plugin/zim.py
index b8fc1fc..8450418 100644
--- a/kupfer/plugin/zim.py
+++ b/kupfer/plugin/zim.py
@@ -16,14 +16,15 @@ __kupfer_actions__ = (
 		"CreateZimPage",
 		"CreateZimPageInNotebook",
 	)
-__description__ = _("Access to Pages stored in Zim - A Desktop Wiki and Outliner")
+__description__ = _("Access to Pages stored in Zim - "
+                    "A Desktop Wiki and Outliner")
 __version__ = "0.3"
 __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 
 __kupfer_settings__ = plugin_support.PluginSettings(
 	{
 		"key" : "page_name_starts_colon",
-		"label": _("Page names starts with ':'"),
+		"label": _("Page names start with :colon"),
 		"type": bool,
 		"value": False,
 	},
@@ -102,7 +103,7 @@ class OpenZimPage(Action):
 	rank_adjust = 10
 
 	def __init__(self):
-		Action.__init__(self, _('Open Zim Page'))
+		Action.__init__(self, _('Open'))
 
 	def activate(self, leaf):
 		_start_zim(leaf.notebook, leaf.page)