[kupfer] kupfer.obj: Name command-execute action "Run"

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 94e8879175e010554ef04519bc1549c274e4500f
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Jan 12 15:44:01 2010 +0100

    kupfer.obj: Name command-execute action "Run"
    
    We call the action to perform a stored Kupfer command, a command such
    as Quit or 'About Kupfer' simply *Run*.
    
    To resolve linguistic disambiguities, we now have *Run (Execute)* for
    executing programs, and simple *Run* for running commands. Translators
    should may translate the new *Run* differently (Perform/Carry
    out/ or similar).

 kupfer/obj/compose.py     |    8 ++------
 kupfer/obj/fileactions.py |    6 ++----
 kupfer/obj/objects.py     |    8 ++++----
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/kupfer/obj/compose.py b/kupfer/obj/compose.py
index 513c8d7..476ce8d 100644
--- a/kupfer/obj/compose.py
+++ b/kupfer/obj/compose.py
@@ -8,13 +8,9 @@ from kupfer.obj.base import Leaf, Action, Source, InvalidDataError
 from kupfer.obj.objects import Perform, RunnableLeaf, TextLeaf
 
 class TimedPerform (Perform):
-	"""A timed proxy version of Perform
-
-	Proxy factory/result/async from a delegate action
-	Delay action by a couple of seconds
-	"""
+	"""A timed (delayed) version of Run (Perform) """
 	def __init__(self):
-		Action.__init__(self, _("Run After Delay..."))
+		Action.__init__(self, _("Run after Delay..."))
 
 	def activate(self, leaf, iobj=None):
 		from kupfer import scheduler
diff --git a/kupfer/obj/fileactions.py b/kupfer/obj/fileactions.py
index 75dbd01..0e0da0e 100644
--- a/kupfer/obj/fileactions.py
+++ b/kupfer/obj/fileactions.py
@@ -160,12 +160,10 @@ class OpenTerminal (Action):
 		return "terminal"
 
 class Execute (Action):
-	"""
-	Execute executable file (FileLeaf)
-	"""
+	""" Execute executable file (FileLeaf) """
 	rank_adjust = 5
 	def __init__(self, in_terminal=False, quoted=True):
-		name = _("Run in Terminal") if in_terminal else _("Run")
+		name = _("Run in Terminal") if in_terminal else _("Run (Execute)")
 		super(Execute, self).__init__(name)
 		self.in_terminal = in_terminal
 		self.quoted = quoted
diff --git a/kupfer/obj/objects.py b/kupfer/obj/objects.py
index ed46ada..833b221 100644
--- a/kupfer/obj/objects.py
+++ b/kupfer/obj/objects.py
@@ -329,8 +329,7 @@ class UrlLeaf (Leaf, TextRepresentation):
 
 class RunnableLeaf (Leaf):
 	"""Leaf where the Leaf is basically the action itself,
-	for items such as Quit, Log out etc. Is executed by the
-	only action Perform
+	for items such as Quit, Log out etc.
 	"""
 	def __init__(self, obj=None, name=None):
 		Leaf.__init__(self, obj, name)
@@ -352,12 +351,13 @@ class Perform (Action):
 	"""Perform the action in a RunnableLeaf"""
 	rank_adjust = 5
 	def __init__(self, name=None):
-		if not name: name = _("Perform")
+		# TRANS: 'Run' as in Perform a (saved) command
+		if not name: name = _("Run")
 		super(Perform, self).__init__(name=name)
 	def activate(self, leaf):
 		return leaf.run()
 	def get_description(self):
-		return _("Carry out command")
+		return _("Perform command")
 
 class TextLeaf (Leaf, TextRepresentation):
 	"""Represent a text query