Merge remote branch 'origin/bug_348_dvdburn_residenttask' into experimental

diff --combined lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
index c3f78d4a20642880140233fe64c302e9ef57afcc,ca571ffed4a2efa4a9bd3253669a352822ccb446..0a664eba7c75f1e3a1d07ed23fd68f88fe4bbdae
--- 1/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
--- 2/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
@@@ -9,7 -9,7 +9,7 @@@ from Components.Sources.StaticText impo
  from Components.Sources.Progress import Progress
  from Components.FileList import FileList
  from Components.Pixmap import Pixmap
- from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, ePicLoad
+ from enigma import ePicLoad
  from Tools.Directories import fileExists, resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS, SCOPE_HDD
  from Components.config import config, getConfigListEntry, ConfigInteger, ConfigSubsection, ConfigSelection
  from Components.ConfigList import ConfigListScreen
@@@ -164,8 -164,7 +164,8 @@@ class LanguageChoices()
                self.choices.sort()
                self.choices.insert(0,("nolang", ("unspecified")))
                self.choices.insert(1,(syslang, self.langdict[syslang]))
 -              self.choices.insert(2,("en", self.langdict["en"]))
 +              if syslang != "en":
 +                      self.choices.insert(2,("en", self.langdict["en"]))
  
        def getLanguage(self, DVB_lang):
                DVB_lang = DVB_lang.lower()