From: acid-burn <acid-burn@opendreambox.org>
Date: Fri, 29 Jan 2010 13:56:27 +0000 (+0100)
Subject: Merge commit 'origin/bug_171_remove_wrong_triple_dots' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~77
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/c65fd5422ede36301e35382effbcc5af591893ce?hp=57ff47aa9d84ac5502a6d1bebcb10780997c3134

Merge commit 'origin/bug_171_remove_wrong_triple_dots' into experimental
---

diff --git a/data/menu.xml b/data/menu.xml
old mode 100644
new mode 100755
index 1b71a152..b437fbc7
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -24,7 +24,7 @@
 		<menu level="0" text="Information" entryID="info_screen">
 			<id val="information" />
 			<item level="1" text="Service" entryID="service_info_screen"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
-			<item level="0" text="About..." entryID="about_screen"><screen module="About" /></item>
+			<item level="0" text="About" entryID="about_screen"><screen module="About" /></item>
 		</menu>
 
 		<item level="1" text="Plugins" entryID="plugin_selection"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
@@ -48,7 +48,7 @@
 			</menu>
 			<menu weight="5" level="0" text="System" entryID="system_selection">
 				<id val="system" />
-				<item level="0" text="Language..." entryID="language_setup"><screen module="LanguageSelection" /></item>
+				<item level="0" text="Language" entryID="language_setup"><screen module="LanguageSelection" /></item>
 				<item level="0" entryID="usage_setup"><setup id="usage" /></item>
 				<item level="0" entryID="timezone_setup"><setup id="timezone"/></item>
 				<item level="0" entryID="av_setup"><setup id="avsetup"/></item>
@@ -57,20 +57,20 @@
 				<menu level="0" text="Harddisk" entryID="hardisk_selection" requires="Harddisk">
 					<id val="harddisk" />
 					<item level="1" entryID="harddisk_setup"><setup id="harddisk"/></item>
-					<item level="0" text="Initialization..." entryID="harddisk_init"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
-					<item level="0" text="Filesystem Check..." entryID="harddisk_check"><screen module="HarddiskSetup" screen="HarddiskFsckSelection"/></item>
+					<item level="0" text="Initialization" entryID="harddisk_init"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
+					<item level="0" text="Filesystem Check" entryID="harddisk_check"><screen module="HarddiskSetup" screen="HarddiskFsckSelection"/></item>
 				</menu>
 				<!--<item text="Remote Control"><setup id="rc" /></item>-->
 				<!--<item text="OSD"><setup id="osd" /></item>-->
 				<item requires="Display"><setup level="1" id="lcd" /></item>
-				<item level="0" text="Network..." entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+				<item level="0" text="Network" entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
 				<item text="Keyboard"><setup id="keyboard" /></item>
 				<!--<menu level="1" text="Network..." entryID="network_setup">
 					<id val="network" />
 					<item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
 					<item level="1" text="Nameserver Setup..." entryID="dns_setup"><screen module="NetworkSetup" screen="NameserverSetup"/></item>
 				</menu>-->
-				<item level="2" text="Recording paths..." entryId="RecordPaths"><screen module="RecordPaths" screen="RecordPathsSettings" /></item>
+				<item level="2" text="Recording paths" entryId="RecordPaths"><screen module="RecordPaths" screen="RecordPathsSettings" /></item>
 			</menu>
 			<item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
 			<item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
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
old mode 100644
new mode 100755
index bb0709e5..2a8801ca
--- 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()
 
diff --git a/po/ar.po b/po/ar.po
index af31414d..b7d5f38c 100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -1981,7 +1981,7 @@ msgstr ""
 msgid "Language selection"
 msgstr "إختيار اللغه"
 
-msgid "Language..."
+msgid "Language"
 msgstr ""
 
 msgid "Last config"
diff --git a/po/ca.po b/po/ca.po
index 9c864b1a..f031cc15 100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -2032,8 +2032,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Selecció d'idioma"
 
-msgid "Language..."
-msgstr "Idioma..."
+msgid "Language"
+msgstr "Idioma"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 52a5e679..14d56c38 100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -2029,8 +2029,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Výběr jazyka"
 
-msgid "Language..."
-msgstr "Jazyk..."
+msgid "Language"
+msgstr "Jazyk"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 43642627..6e5bfa56 100755
--- a/po/da.po
+++ b/po/da.po
@@ -2054,8 +2054,8 @@ msgstr "LOF/V"
 msgid "Language selection"
 msgstr "Valg af sprog"
 
-msgid "Language..."
-msgstr "Sprog..."
+msgid "Language"
+msgstr "Sprog"
 
 msgid "Last config"
 msgstr "Seneste opsætning"
diff --git a/po/de.po b/po/de.po
index 39ec331d..6563d064 100755
--- a/po/de.po
+++ b/po/de.po
@@ -2048,8 +2048,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Sprachauswahl"
 
-msgid "Language..."
-msgstr "Sprache..."
+msgid "Language"
+msgstr "Sprache"
 
 msgid "Last config"
 msgstr "Letzte Konfiguration"
diff --git a/po/el.po b/po/el.po
index eed12f4f..13337987 100755
--- a/po/el.po
+++ b/po/el.po
@@ -2035,7 +2035,7 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Επιλογή γλώσσας"
 
-msgid "Language..."
+msgid "Language"
 msgstr "Γλώσσα "
 
 msgid "Last config"
diff --git a/po/en.po b/po/en.po
index fb7023de..6d440e63 100755
--- a/po/en.po
+++ b/po/en.po
@@ -1974,7 +1974,7 @@ msgstr ""
 msgid "Language selection"
 msgstr ""
 
-msgid "Language..."
+msgid "Language"
 msgstr ""
 
 msgid "Last config"
diff --git a/po/enigma2.pot b/po/enigma2.pot
index c341d2ab..903ad031 100755
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -4824,7 +4824,7 @@ msgstr ""
 msgid "Keymap"
 msgstr ""
 
-msgid "Language..."
+msgid "Language"
 msgstr ""
 
 msgid "Limited character set for recording filenames"
diff --git a/po/es.po b/po/es.po
index 79169784..f0fb7ffd 100755
--- a/po/es.po
+++ b/po/es.po
@@ -2056,8 +2056,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Selección de idioma"
 
-msgid "Language..."
-msgstr "Idioma..."
+msgid "Language"
+msgstr "Idioma"
 
 msgid "Last config"
 msgstr "Última config:"
diff --git a/po/et.po b/po/et.po
index 3f0b4298..c7d76555 100755
--- a/po/et.po
+++ b/po/et.po
@@ -2087,7 +2087,7 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Keele valik"
 
-msgid "Language..."
+msgid "Language"
 msgstr "Keel"
 
 msgid "Last config"
diff --git a/po/fi.po b/po/fi.po
index 03c35dd2..dc2d7498 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -2102,8 +2102,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Kielivalinta"
 
-msgid "Language..."
-msgstr "Kielivalinta..."
+msgid "Language"
+msgstr "Kielivalinta"
 
 msgid "Last config"
 msgstr "Aikais.arvot"
diff --git a/po/fr.po b/po/fr.po
index 3c9e4eb3..a5dd6811 100755
--- a/po/fr.po
+++ b/po/fr.po
@@ -2080,8 +2080,8 @@ msgstr ""
 msgid "Language selection"
 msgstr "Sélection de la langue"
 
-msgid "Language..."
-msgstr "Langage..."
+msgid "Language"
+msgstr "Langage"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/fy.po b/po/fy.po
index 8f41e828..b330a51f 100755
--- a/po/fy.po
+++ b/po/fy.po
@@ -2047,8 +2047,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Taal Kieze"
 
-msgid "Language..."
-msgstr "Taal..."
+msgid "Language"
+msgstr "Taal"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 520655b0..29bcd680 100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -2020,8 +2020,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Odaberite Jezik"
 
-msgid "Language..."
-msgstr "Jezik..."
+msgid "Language"
+msgstr "Jezik"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 3203d733..7139e6d0 100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -2052,8 +2052,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Válasszon nyelvet"
 
-msgid "Language..."
-msgstr "Nyelvezet..."
+msgid "Language"
+msgstr "Nyelvezet"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 69fbfd99..a26d6bc9 100755
--- a/po/is.po
+++ b/po/is.po
@@ -2084,8 +2084,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Val tungumáls"
 
-msgid "Language..."
-msgstr "Tungumál..."
+msgid "Language"
+msgstr "Tungumál"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index e169131b..f965dab8 100755
--- a/po/it.po
+++ b/po/it.po
@@ -2056,8 +2056,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Selezione lingua"
 
-msgid "Language..."
-msgstr "Lingua..."
+msgid "Language"
+msgstr "Lingua"
 
 msgid "Last config"
 msgstr "Ult. config."
diff --git a/po/lt.po b/po/lt.po
index 3bc1929a..cc62f205 100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -2046,8 +2046,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Kalbos pasirinkimas"
 
-msgid "Language..."
-msgstr "Kalba..."
+msgid "Language"
+msgstr "Kalba"
 
 msgid "Last config"
 msgstr "Paskutinis config"
diff --git a/po/lv.po b/po/lv.po
index 1d7f82d3..4ff18807 100755
--- a/po/lv.po
+++ b/po/lv.po
@@ -2096,8 +2096,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Valodas izvēle"
 
-msgid "Language..."
-msgstr "Valoda..."
+msgid "Language"
+msgstr "Valoda"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4c7b0b83..e27caa51 100755
--- a/po/nl.po
+++ b/po/nl.po
@@ -2054,8 +2054,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Taalkeuze"
 
-msgid "Language..."
-msgstr "Taal..."
+msgid "Language"
+msgstr "Taal"
 
 msgid "Last config"
 msgstr "Laatste config"
diff --git a/po/no.po b/po/no.po
index 688538df..1f650083 100755
--- a/po/no.po
+++ b/po/no.po
@@ -2034,8 +2034,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Språkvalg"
 
-msgid "Language..."
-msgstr "Språk..."
+msgid "Language"
+msgstr "Språk"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 06ebe1ac..f90c496e 100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -2089,8 +2089,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Wybór języka"
 
-msgid "Language..."
-msgstr "Język..."
+msgid "Language"
+msgstr "Język"
 
 msgid "Last config"
 msgstr "Ostatnie ust"
diff --git a/po/pt.po b/po/pt.po
index fb714552..a357ed1b 100755
--- a/po/pt.po
+++ b/po/pt.po
@@ -2035,7 +2035,7 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Selecção do Idioma"
 
-msgid "Language..."
+msgid "Language"
 msgstr "Idioma"
 
 msgid "Last config"
diff --git a/po/ru.po b/po/ru.po
index 26c14422..c2d81fd4 100755
--- a/po/ru.po
+++ b/po/ru.po
@@ -2072,8 +2072,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Выбор языка"
 
-msgid "Language..."
-msgstr "Язык..."
+msgid "Language"
+msgstr "Язык"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index b60ce749..06a8edd7 100755
--- a/po/sk.po
+++ b/po/sk.po
@@ -2096,8 +2096,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Voľba jazyka"
 
-msgid "Language..."
-msgstr "Jazyk..."
+msgid "Language"
+msgstr "Jazyk"
 
 msgid "Last config"
 msgstr "Posledný config"
diff --git a/po/sl.po b/po/sl.po
index 08ccfdd9..d61b1183 100755
--- a/po/sl.po
+++ b/po/sl.po
@@ -2048,8 +2048,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Izberite jezik"
 
-msgid "Language..."
-msgstr "Jezik..."
+msgid "Language"
+msgstr "Jezik"
 
 msgid "Last config"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 9959fc43..9ca70c4f 100755
--- a/po/sr.po
+++ b/po/sr.po
@@ -2092,8 +2092,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Izbor jezika"
 
-msgid "Language..."
-msgstr "Jezik..."
+msgid "Language"
+msgstr "Jezik"
 
 msgid "Last config"
 msgstr "Zadnji konfig"
diff --git a/po/sv.po b/po/sv.po
index d7736f1c..53c49427 100755
--- a/po/sv.po
+++ b/po/sv.po
@@ -2058,8 +2058,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Välj språk"
 
-msgid "Language..."
-msgstr "Språk..."
+msgid "Language"
+msgstr "Språk"
 
 msgid "Last config"
 msgstr "Senaste konfiguration"
diff --git a/po/tr.po b/po/tr.po
index 5e3a829a..1b23f651 100755
--- a/po/tr.po
+++ b/po/tr.po
@@ -2098,7 +2098,7 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Dil seçimi"
 
-msgid "Language..."
+msgid "Language"
 msgstr "Dil ayarları"
 
 msgid "Last config"
diff --git a/po/uk.po b/po/uk.po
index 1aa724b5..7821c536 100755
--- a/po/uk.po
+++ b/po/uk.po
@@ -2086,8 +2086,8 @@ msgstr "LOF/L"
 msgid "Language selection"
 msgstr "Вибір мови"
 
-msgid "Language..."
-msgstr "Мова..."
+msgid "Language"
+msgstr "Мова"
 
 msgid "Last config"
 msgstr ""