From 939c323eadd7ec9d3656bfe59a46c630415bdb19 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 29 Jan 2010 14:51:34 +0100 Subject: [PATCH] * Remove triple dot "..." from main menu entries and main menu plugin names. This fixes bug #171 Please enter the commit message for your changes. Lines starting --- data/menu.xml | 12 ++++++------ lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py | 2 +- .../Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py | 2 +- lib/python/Plugins/SystemPlugins/NetworkWizard/plugin.py | 4 ++-- lib/python/Plugins/SystemPlugins/Videomode/plugin.py | 2 +- lib/python/Screens/Menu.py | 4 ++-- po/ar.po | 2 +- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 2 +- po/en.po | 2 +- po/enigma2.pot | 2 +- po/es.po | 4 ++-- po/et.po | 2 +- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/fy.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/is.po | 4 ++-- po/it.po | 4 ++-- po/lt.po | 4 ++-- po/lv.po | 4 ++-- po/nl.po | 4 ++-- po/no.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 2 +- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sr.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 2 +- po/uk.po | 4 ++-- 36 files changed, 66 insertions(+), 66 deletions(-) mode change 100644 => 100755 data/menu.xml mode change 100644 => 100755 lib/python/Screens/Menu.py mode change 100644 => 100755 po/de.po mode change 100644 => 100755 po/enigma2.pot mode change 100644 => 100755 po/es.po mode change 100644 => 100755 po/fi.po mode change 100644 => 100755 po/fr.po mode change 100644 => 100755 po/it.po mode change 100644 => 100755 po/nl.po mode change 100644 => 100755 po/pl.po mode change 100644 => 100755 po/ru.po mode change 100644 => 100755 po/sv.po diff --git a/data/menu.xml b/data/menu.xml old mode 100644 new mode 100755 index 59195f1..fbc5295 --- a/data/menu.xml +++ b/data/menu.xml @@ -24,7 +24,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -57,20 +57,20 @@ - - + + - + - + diff --git a/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py b/lib/python/Plugins/SystemPlugins/CleanupWizard/plugin.py index 6667e3e..f8677bb 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 cf998a7..2563981 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 dc3beca..49ec7da 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 733edd6..39c1131 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 bb0709e..2a8801c --- 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 077d4bf..12bc716 100755 --- a/po/ar.po +++ b/po/ar.po @@ -1926,7 +1926,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 13b6031..54ae777 100755 --- a/po/ca.po +++ b/po/ca.po @@ -1977,8 +1977,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 a7bbd8d..e529bf6 100755 --- a/po/cs.po +++ b/po/cs.po @@ -1974,8 +1974,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 f3c1fa4..3918f94 100755 --- a/po/da.po +++ b/po/da.po @@ -2029,8 +2029,8 @@ msgstr "LOF/V" msgid "Language selection" msgstr "Valg af sprog" -msgid "Language..." -msgstr "Sprog..." +msgid "Language" +msgstr "Sprog" msgid "Last config" msgstr "" diff --git a/po/de.po b/po/de.po old mode 100644 new mode 100755 index 2c11213..1eeb96c --- a/po/de.po +++ b/po/de.po @@ -1991,8 +1991,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 0a9546e..ee23413 100755 --- a/po/el.po +++ b/po/el.po @@ -1980,7 +1980,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 57fe7d5..fbf164b 100755 --- a/po/en.po +++ b/po/en.po @@ -1919,7 +1919,7 @@ msgstr "" msgid "Language selection" msgstr "" -msgid "Language..." +msgid "Language" msgstr "" msgid "Last config" diff --git a/po/enigma2.pot b/po/enigma2.pot old mode 100644 new mode 100755 index 1f79e4e..cf00a2b --- a/po/enigma2.pot +++ b/po/enigma2.pot @@ -4739,7 +4739,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 old mode 100644 new mode 100755 index b32653d..1957a5f --- a/po/es.po +++ b/po/es.po @@ -2038,8 +2038,8 @@ msgstr "LOF/L" msgid "Language selection" msgstr "Selección de idioma" -msgid "Language..." -msgstr "Idioma..." +msgid "Language" +msgstr "Idioma" msgid "Last config" msgstr "" diff --git a/po/et.po b/po/et.po index 28be364..c37221b 100755 --- a/po/et.po +++ b/po/et.po @@ -2036,7 +2036,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 old mode 100644 new mode 100755 index 806c044..70216f3 --- a/po/fi.po +++ b/po/fi.po @@ -2047,8 +2047,8 @@ msgstr "LOF/L" msgid "Language selection" msgstr "Kielivalinta" -msgid "Language..." -msgstr "Kielivalinta..." +msgid "Language" +msgstr "Kielivalinta" msgid "Last config" msgstr "" diff --git a/po/fr.po b/po/fr.po old mode 100644 new mode 100755 index ef0728b..62c8b9c --- a/po/fr.po +++ b/po/fr.po @@ -2029,8 +2029,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 a9c0eaa..35dc3ae 100755 --- a/po/fy.po +++ b/po/fy.po @@ -1992,8 +1992,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 d439969..4bd766b 100755 --- a/po/hr.po +++ b/po/hr.po @@ -1965,8 +1965,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 3b1df1e..176e265 100755 --- a/po/hu.po +++ b/po/hu.po @@ -1997,8 +1997,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 b839ad4..7234032 100755 --- a/po/is.po +++ b/po/is.po @@ -2033,8 +2033,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 old mode 100644 new mode 100755 index e679bbe..174b2a0 --- a/po/it.po +++ b/po/it.po @@ -2040,8 +2040,8 @@ msgstr "LOF/L" msgid "Language selection" msgstr "Selezione lingua" -msgid "Language..." -msgstr "Lingua..." +msgid "Language" +msgstr "Lingua" msgid "Last config" msgstr "" diff --git a/po/lt.po b/po/lt.po index 70f6e05..6dd526c 100755 --- a/po/lt.po +++ b/po/lt.po @@ -2038,8 +2038,8 @@ msgstr "LOF/L" msgid "Language selection" msgstr "Kalbos pasirinkimas" -msgid "Language..." -msgstr "Kalba..." +msgid "Language" +msgstr "Kalba" msgid "Last config" msgstr "" diff --git a/po/lv.po b/po/lv.po index d5f36d2..1174c92 100755 --- a/po/lv.po +++ b/po/lv.po @@ -2045,8 +2045,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 old mode 100644 new mode 100755 index c247606..2cf7390 --- a/po/nl.po +++ b/po/nl.po @@ -1998,8 +1998,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 b2519fa..469dc7d 100755 --- a/po/no.po +++ b/po/no.po @@ -1979,8 +1979,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 old mode 100644 new mode 100755 index 03f28d5..0b6bf4d --- a/po/pl.po +++ b/po/pl.po @@ -1996,8 +1996,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 7ea9966..d2a5603 100755 --- a/po/pt.po +++ b/po/pt.po @@ -1980,7 +1980,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 old mode 100644 new mode 100755 index 0c32cf4..807193a --- a/po/ru.po +++ b/po/ru.po @@ -2021,8 +2021,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 ddf7ade..b51fda4 100755 --- a/po/sk.po +++ b/po/sk.po @@ -2045,8 +2045,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 0add903..d880640 100755 --- a/po/sl.po +++ b/po/sl.po @@ -1993,8 +1993,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 6e46eb8..9402d5c 100755 --- a/po/sr.po +++ b/po/sr.po @@ -1995,8 +1995,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 old mode 100644 new mode 100755 index a437a8e..dd0d152 --- a/po/sv.po +++ b/po/sv.po @@ -2042,8 +2042,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 8da2746..0d6eaff 100755 --- a/po/tr.po +++ b/po/tr.po @@ -2047,7 +2047,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 ed3e635..c63a6d9 100755 --- a/po/uk.po +++ b/po/uk.po @@ -2035,8 +2035,8 @@ msgstr "LOF/L" msgid "Language selection" msgstr "Вибір мови" -msgid "Language..." -msgstr "Мова..." +msgid "Language" +msgstr "Мова" msgid "Last config" msgstr "" -- 2.7.4