Merge commit 'origin/bug_171_remove_wrong_triple_dots'

5 files changed, 7 insertions, 7 deletions

diff --git a/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py b/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py
index 6667e3e3..f8677bb2 100755
--- a/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py
@@ -122,7 +122,7 @@ def selSetup(menuid, **kwargs):
 	if menuid != "system":
 		return [ ]
 
-	return [(_("Cleanup Wizard settings") + "...", openconfig, "cleanup_config", 71)]
+	return [(_("Cleanup Wizard settings"), openconfig, "cleanup_config", 71)]
 
 def Plugins(**kwargs):
 	list = []
diff --git a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
index cf998a79..25639818 100755
--- a/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
@@ -391,7 +391,7 @@ def selSetup(menuid, **kwargs):
 	if menuid != "system":
 		return [ ]
 
-	return [(_("Crashlog settings") + "...", openconfig, "crashlog_config", 70)]
+	return [(_("Crashlog settings"), openconfig, "crashlog_config", 70)]
 
 
 def Plugins(**kwargs):
diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/plugin.py b/lib/python/Plugins/SystemPlugins/NetworkWizard/plugin.py
index dc3becac..49ec7da8 100755
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/plugin.py
@@ -9,7 +9,7 @@ def startSetup(menuid):
 	if menuid != "system": 
 		return [ ]
 
-	return [(_("Network Wizard") + "...", NetworkWizardMain, "nw_wizard", 40)]
+	return [(_("Network Wizard"), NetworkWizardMain, "nw_wizard", 40)]
 
 def NetworkWizard(*args, **kwargs):
 	from NetworkWizard import NetworkWizard
@@ -19,4 +19,4 @@ def Plugins(**kwargs):
 	list = []
 	if config.misc.firstrun.value:
 		list.append(PluginDescriptor(name=_("Network Wizard"), where = PluginDescriptor.WHERE_WIZARD, fnc=(25, NetworkWizard)))
- 	return list
+	return list
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 733edd6d..39c1131a 100755
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -218,7 +218,7 @@ def startSetup(menuid):
 	if menuid != "system": 
 		return [ ]
 
-	return [(_("A/V Settings") + "...", videoSetupMain, "av_setup", 40)]
+	return [(_("A/V Settings"), videoSetupMain, "av_setup", 40)]
 
 def VideoWizard(*args, **kwargs):
 	from VideoWizard import VideoWizard
diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py
index bb0709e5..2a8801ca 100644..100755
--- a/lib/python/Screens/Menu.py
+++ b/lib/python/Screens/Menu.py
@@ -160,7 +160,7 @@ class Menu(Screen):
 			elif x.tag == 'setup':
 				id = x.get("id")
 				if item_text == "":
-					item_text = _(getSetupTitle(id)) + "..."
+					item_text = _(getSetupTitle(id))
 				else:
 					item_text = _(item_text)
 				destList.append((item_text, boundFunction(self.openSetup, id), entryID, weight))
@@ -245,7 +245,7 @@ class Menu(Screen):
 		# Calculate index
 		number -= 1
 
- 		if len(self["menu"].list) > number:
+		if len(self["menu"].list) > number:
 			self["menu"].setIndex(number)
 			self.okbuttonClick()