[kupfer] Edit strings for consistency in email and communications plugins

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 03cbf6b8e4df26217bda7c0c094e3587e1b63488
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Jan 12 22:46:05 2010 +0100

    Edit strings for consistency in email and communications plugins

 kupfer/plugin/clawsmail.py   |   14 +++++++-------
 kupfer/plugin/defaultmail.py |    5 +++--
 kupfer/plugin/skype.py       |   20 +++++++++++---------
 kupfer/plugin/thunderbird.py |    6 +++---
 4 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/kupfer/plugin/clawsmail.py b/kupfer/plugin/clawsmail.py
index 44c731c..343d80d 100644
--- a/kupfer/plugin/clawsmail.py
+++ b/kupfer/plugin/clawsmail.py
@@ -21,13 +21,13 @@ __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 class ComposeMail(RunnableLeaf):
 	''' Create new mail without recipient '''
 	def __init__(self):
-		RunnableLeaf.__init__(self, name=_("Compose New Mail"))
+		RunnableLeaf.__init__(self, name=_("Compose New Email"))
 
 	def run(self):
 		utils.launch_commandline('claws-mail --compose')
 
 	def get_description(self):
-		return _("Compose New Mail with Claws Mail")
+		return _("Compose a new message in Claws Mail")
 
 	def get_icon_name(self):
 		return "mail-message-new"
@@ -36,13 +36,13 @@ class ComposeMail(RunnableLeaf):
 class ReceiveMail(RunnableLeaf):
 	''' Receive all new mail from all accounts '''
 	def __init__(self):
-		RunnableLeaf.__init__(self, name=_("Receive All Mails"))
+		RunnableLeaf.__init__(self, name=_("Receive All Email"))
 
 	def run(self):
 		utils.launch_commandline('claws-mail --receive-all')
 
 	def get_description(self):
-		return _("Receive new mail from all accounts by ClawsMail")
+		return _("Receive new messages from all accounts in ClawsMail")
 
 	def get_icon_name(self):
 		return "mail-send-receive"
@@ -51,7 +51,7 @@ class ReceiveMail(RunnableLeaf):
 class NewMailAction(Action):
 	''' Create new mail to selected leaf'''
 	def __init__(self):
-		Action.__init__(self, _('Compose New Mail To'))
+		Action.__init__(self, _('Compose Email'))
 
 	def activate(self, leaf):
 		email = email_from_leaf(leaf)
@@ -73,7 +73,7 @@ class NewMailAction(Action):
 class SendFileByMail (Action):
 	'''Create new e-mail and attach selected file'''
 	def __init__(self):
-		Action.__init__(self, _('Send by Email To..'))
+		Action.__init__(self, _('Send in Email To...'))
 
 	def activate(self, obj, iobj):
 		filepath = obj.object
@@ -97,7 +97,7 @@ class SendFileByMail (Action):
 		return bool(email_from_leaf(iobj))
 
 	def get_description(self):
-		return _("Compose new email in ClawsMail and attach file")
+		return _("Compose new message in Claws Mail and attach file")
 	def get_icon_name(self):
 		return "document-send"
 
diff --git a/kupfer/plugin/defaultmail.py b/kupfer/plugin/defaultmail.py
index 64b286e..7553c70 100644
--- a/kupfer/plugin/defaultmail.py
+++ b/kupfer/plugin/defaultmail.py
@@ -9,11 +9,12 @@ __kupfer_actions__ = (
 	"SendFileByMail",
 )
 __description__ = _("Compose email using the system's default mailto: handler")
+__version__ = "2010-01-12"
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
 class NewMailAction(Action):
 	def __init__(self):
-		Action.__init__(self, _('Compose New Mail'))
+		Action.__init__(self, _('Compose Email'))
 
 	def activate(self, leaf):
 		email = email_from_leaf(leaf)
@@ -33,7 +34,7 @@ class NewMailAction(Action):
 
 class SendFileByMail (Action):
 	def __init__(self):
-		Action.__init__(self, _('Send by Email To..'))
+		Action.__init__(self, _('Send in Email To...'))
 
 	def activate(self, obj, iobj):
 		filepath = obj.object
diff --git a/kupfer/plugin/skype.py b/kupfer/plugin/skype.py
index d98a4b4..9fb3b4d 100644
--- a/kupfer/plugin/skype.py
+++ b/kupfer/plugin/skype.py
@@ -13,7 +13,7 @@ from kupfer.obj.contacts import ContactLeaf, NAME_KEY
 __kupfer_name__ = _("Skype")
 __kupfer_sources__ = ("ContactsSource", )
 __kupfer_actions__ = ("ChangeStatus", 'Chat', 'Call')
-__description__ = _("Access to Skype")
+__description__ = _("Access to Skype contacts")
 __version__ = "2010-01-07"
 __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 
@@ -198,43 +198,45 @@ class Chat(Action):
 	rank_adjust = 5
 
 	def __init__(self):
-		Action.__init__(self, _("Open Chat Window"))
+		Action.__init__(self, _("Open Chat"))
 
 	def activate(self, leaf):
 		handle = SKYPE_KEY in leaf and leaf[SKYPE_KEY]
 		if handle:
 			Skype.get().open_chat(handle)
 
-	def get_icon_name(self):
-		return 'internet-group-chat'
-
 	def item_types(self):
 		yield ContactLeaf
 
 	def valid_for_item(self, item):
 		return SKYPE_KEY in item and item[SKYPE_KEY]
 
+	def get_icon_name(self):
+		return 'internet-group-chat'
+
 
 class Call(Action):
 	rank_adjust = 5
 
 	def __init__(self):
-		Action.__init__(self, _("Place a Call to Contact"))
+		Action.__init__(self, _("Call"))
 
 	def activate(self, leaf):
 		handle = SKYPE_KEY in leaf and leaf[SKYPE_KEY]
 		if handle:
 			Skype.get().call(handle)
 
-	def get_icon_name(self):
-		return 'call-start'
-
 	def item_types(self):
 		yield ContactLeaf
 
 	def valid_for_item(self, item):
 		return SKYPE_KEY in item and item[SKYPE_KEY]
 
+	def get_description(self):
+		return _("Place a call to contact")
+
+	def get_icon_name(self):
+		return 'call-start'
 
 
 class ChangeStatus(Action):
diff --git a/kupfer/plugin/thunderbird.py b/kupfer/plugin/thunderbird.py
index bba8547..0884f8e 100644
--- a/kupfer/plugin/thunderbird.py
+++ b/kupfer/plugin/thunderbird.py
@@ -26,14 +26,14 @@ __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 class ComposeMail(RunnableLeaf):
 	''' Create new mail without recipient '''
 	def __init__(self):
-		RunnableLeaf.__init__(self, name=_("Compose New Mail"))
+		RunnableLeaf.__init__(self, name=_("Compose New Email"))
 
 	def run(self):
 		if not utils.launch_commandline('thunderbird --compose'):
 			utils.launch_commandline('icedove --compose')
 
 	def get_description(self):
-		return _("Compose New Mail with Thunderbird")
+		return _("Compose a new message in Thunderbird")
 
 	def get_icon_name(self):
 		return "mail-message-new"
@@ -42,7 +42,7 @@ class ComposeMail(RunnableLeaf):
 class NewMailAction(Action):
 	''' Createn new mail to selected leaf (Contact or TextLeaf)'''
 	def __init__(self):
-		Action.__init__(self, _('Compose New Mail To'))
+		Action.__init__(self, _('Compose Email'))
 
 	def activate(self, leaf):
 		email = email_from_leaf(leaf)