make texts translateable and add german locale for new DVDBurn changes

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
index 4923d4da97cb1cf6279e660300b8a1dd2cfbbd22..112a221e2500db44676e740826a6eac6d416f86d 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
@@ -32,7 +32,7 @@ class DVDProject:
                self.settings = ConfigSubsection()
                self.settings.name = ConfigText(fixed_size = False, visible_width = 40)
                self.settings.authormode = ConfigSelection(choices = [("menu_linked", _("Linked titles with a DVD menu")), ("just_linked", _("Direct playback of linked titles without menu")), ("menu_seperate", _("Seperate titles with a main menu")), ("data_ts", _("Dreambox format data DVD (HDTV compatible)"))])
-               self.settings.titlesetmode = ConfigSelection(choices = [("single", ("Simple titleset (compatibility for legacy players)")), ("multi", ("Complex (allows mixing audio tracks and aspects)"))], default="multi")
+               self.settings.titlesetmode = ConfigSelection(choices = [("single", _("Simple titleset (compatibility for legacy players)")), ("multi", _("Complex (allows mixing audio tracks and aspects)"))], default="multi")
                self.settings.output = ConfigSelection(choices = [("iso", _("Create DVD-ISO")), ("dvd", _("Burn DVD"))])
                self.settings.isopath = ConfigText(fixed_size = False, visible_width = 40)
                self.settings.dataformat = ConfigSelection(choices = [("iso9660_1", ("ISO9660 Level 1")), ("iso9660_4", ("ISO9660 version 2")), ("udf", ("UDF"))])                      

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py b/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
index 94e5c0f5528bf31bbadd8856a58d27a3b6fd29cf..b1c627aa4e3d3e2c842e2ad6ad9994db1f98d972 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
@@ -14,7 +14,7 @@ class DVDTitle:
                self.DVBname = _("Title")
                self.DVBdescr = _("Description")
                self.DVBchannel = _("Channel")
-               self.properties.aspect = ConfigSelection(choices = [("4:3", "4:3"), ("16:9", "16:9")])
+               self.properties.aspect = ConfigSelection(choices = [("4:3", _("4:3")), ("16:9", _("16:9"))])
                self.properties.widescreen = ConfigSelection(choices = [("nopanscan", "nopanscan"), ("noletterbox", "noletterbox")])
                self.properties.autochapter = ConfigInteger(default = 0, limits = (0, 60))
                self.properties.audiotracks = ConfigSubList()

diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
index 416c14e9123e1c8b657025abc75de68c42bd068b..345af87736c8e296355ff8aed0ec46f1ddb5bf4d 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
@@ -41,7 +41,7 @@ class TitleList(Screen, HelpableScreen):
                self["titleactions"] = HelpableActionMap(self, "DVDTitleList",
                        {
                                "addTitle": (self.addTitle, _("Add a new title"), _("Add title")),
-                               "titleProperties": (self.titleProperties, ("Properties of current title"), _("Title properties")),
+                               "titleProperties": (self.titleProperties, _("Properties of current title"), _("Title properties")),
                                "removeCurrentTitle": (self.removeCurrentTitle, _("Remove currently selected title"), _("Remove title")),
                                "settings": (self.settings, _("Collection settings"), _("Settings")),
                                "burnProject": (self.burnProject, _("Burn DVD"), _("Burn DVD")),
@@ -85,9 +85,9 @@ class TitleList(Screen, HelpableScreen):
                menu.append((_("DVD media toolbox"), self.toolbox))
                menu.append((_("Preview menu"), self.previewMenu))
                menu.append((_("Collection settings"), self.settings))
-               menu.append(("Reset and renumerate title names", self.resetTitles))
+               menu.append((_("Reset and renumerate title names"), self.resetTitles))
                menu.append((_("Edit chapters of current title"), self.editTitle))
-               menu.append(("Properties of current title", self.titleProperties))
+               menu.append((_("Properties of current title"), self.titleProperties))
                menu.append((_("Add a new title"), self.addTitle))
                menu.append((_("Remove title"), self.removeCurrentTitle))
                menu.append((_("Exit"), self.leave))

diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
index 505dd09343ecbd4d7b7ac62990bca08dd2101f18..d5ba6c16ad6dd53460157ec736c66f9d9d782a68 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
@@ -16,14 +16,12 @@ import DVDTitle
 
 class TitleProperties(Screen,ConfigListScreen):
        skin = """
-               <screen position="90,83" size="560,445" title="Title properties" >
+               <screen position="90,83" size="560,445" title="Properties of current title" >
                    <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
                    <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-                   <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
                    <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
                    <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
                    <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-                   <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
                    <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
                    <widget name="config" position="10,50" size="540,300" scrollbarMode="showOnDemand" />
                    <widget source="serviceinfo_headline" render="Label" position="20,360" size="520,20" font="Regular;20" />
@@ -38,8 +36,7 @@ class TitleProperties(Screen,ConfigListScreen):
 
                self["key_red"] = StaticText(_("Cancel"))
                self["key_green"] = StaticText(_("OK"))
-               self["key_yellow"] = StaticText(_("Edit Title"))
-               self["key_blue"] = StaticText(_("Save"))
+               self["key_blue"] = StaticText(_("Edit Title"))
                self["serviceinfo_headline"] = StaticText("DVB info:")
                self["serviceinfo"] = StaticText()
 
@@ -52,50 +49,52 @@ class TitleProperties(Screen,ConfigListScreen):
                        audiotrack.active.addNotifier(self.initConfigList)
                
                self.initConfigList()
-                       
+
                self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
                {
                    "green": self.exit,
                    "red": self.cancel,
-                   #"blue": self.saveProject,
-                   "yellow": self.editTitle,
+                   "blue": self.editTitle,
                    "cancel": self.cancel,
                    "ok": self.ok,
                }, -2)
 
        def initConfigList(self, element=None):
-               self.properties.position = ConfigInteger(default = self.title_idx+1, limits = (1, len(self.project.titles)))
-               title = self.project.titles[self.title_idx]
-               self.list = []
-               self.list.append(getConfigListEntry("DVD " + _("Track"), self.properties.position))
-               self.list.append(getConfigListEntry("DVD " + _("Title"), self.properties.menutitle))
-               self.list.append(getConfigListEntry("DVD " + _("Description"), self.properties.menusubtitle))
-               for audiotrack in self.properties.audiotracks:
-                       DVB_aud = audiotrack.DVB_lang.getValue() or audiotrack.pid.getValue()
-                       self.list.append(getConfigListEntry("burn audio track (%s)" % DVB_aud, audiotrack.active))
-                       if audiotrack.active.getValue():
-                               self.list.append(getConfigListEntry("audio track (%s) format" % DVB_aud, audiotrack.format))
-                               self.list.append(getConfigListEntry("audio track (%s) language" % DVB_aud, audiotrack.language))
-                               
-               self.list.append(getConfigListEntry("DVD " + _("Aspect Ratio"), self.properties.aspect))
-               if self.properties.aspect.getValue() == "16:9":
-                       self.list.append(getConfigListEntry("DVD " + "widescreen", self.properties.widescreen))
-               else:
-                       self.list.append(getConfigListEntry("DVD " + "widescreen", self.properties.crop))
-               
-               infotext = _("Available format variables") + ":\n$i=" + _("Track") + ", $t=" + _("Title") + ", $d=" + _("Description") + ", $l=" + _("length") + ", $c=" + _("chapters") + ",\n" + _("Record") + " $T=" + _("Begin time") + ", $Y=" + _("year") + ", $M=" + _("month") + ", $D=" + _("day") + ",\n$A=" + _("audio tracks") + ", $C=" + _("Channel") + ", $f=" + _("filename")
-               self["info"] = StaticText(infotext)
-               
-               if len(title.chaptermarks) == 0:
-                       self.list.append(getConfigListEntry(_("Auto chapter split every ? minutes (0=never)"), self.properties.autochapter))
-               infotext = _("Title") + ': ' + title.DVBname + "\n" + _("Description") + ': ' + title.DVBdescr + "\n" + _("Channel") + ': ' + title.DVBchannel
-               chaptermarks = title.getChapterMarks(template="$h:$m:$s")
-               chapters_count = len(chaptermarks)
-               if chapters_count >= 1:
-                       infotext += ', ' + str(chapters_count+1) + ' ' + _("chapters") + ' ('
-                       infotext += ' / '.join(chaptermarks) + ')'
-               self["serviceinfo"].setText(infotext)
-               self["config"].setList(self.list)
+               try:
+                       self.properties.position = ConfigInteger(default = self.title_idx+1, limits = (1, len(self.project.titles)))
+                       title = self.project.titles[self.title_idx]
+                       self.list = []
+                       self.list.append(getConfigListEntry("DVD " + _("Track"), self.properties.position))
+                       self.list.append(getConfigListEntry("DVD " + _("Title"), self.properties.menutitle))
+                       self.list.append(getConfigListEntry("DVD " + _("Description"), self.properties.menusubtitle))
+                       for audiotrack in self.properties.audiotracks:
+                               DVB_aud = audiotrack.DVB_lang.getValue() or audiotrack.pid.getValue()
+                               self.list.append(getConfigListEntry(_("burn audio track (%s)") % DVB_aud, audiotrack.active))
+                               if audiotrack.active.getValue():
+                                       self.list.append(getConfigListEntry(_("audio track (%s) format") % DVB_aud, audiotrack.format))
+                                       self.list.append(getConfigListEntry(_("audio track (%s) language") % DVB_aud, audiotrack.language))
+                                       
+                       self.list.append(getConfigListEntry("DVD " + _("Aspect Ratio"), self.properties.aspect))
+                       if self.properties.aspect.getValue() == "16:9":
+                               self.list.append(getConfigListEntry("DVD " + "widescreen", self.properties.widescreen))
+                       else:
+                               self.list.append(getConfigListEntry("DVD " + "widescreen", self.properties.crop))
+                       
+                       infotext = _("Available format variables") + ":\n$i=" + _("Track") + ", $t=" + _("Title") + ", $d=" + _("Description") + ", $l=" + _("length") + ", $c=" + _("chapters") + ",\n" + _("Record") + " $T=" + _("Begin time") + ", $Y=" + _("year") + ", $M=" + _("month") + ", $D=" + _("day") + ",\n$A=" + _("audio tracks") + ", $C=" + _("Channel") + ", $f=" + _("filename")
+                       self["info"] = StaticText(infotext)
+                       
+                       if len(title.chaptermarks) == 0:
+                               self.list.append(getConfigListEntry(_("Auto chapter split every ? minutes (0=never)"), self.properties.autochapter))
+                       infotext = _("Title") + ': ' + title.DVBname + "\n" + _("Description") + ': ' + title.DVBdescr + "\n" + _("Channel") + ': ' + title.DVBchannel
+                       chaptermarks = title.getChapterMarks(template="$h:$m:$s")
+                       chapters_count = len(chaptermarks)
+                       if chapters_count >= 1:
+                               infotext += ', ' + str(chapters_count+1) + ' ' + _("chapters") + ' ('
+                               infotext += ' / '.join(chaptermarks) + ')'
+                       self["serviceinfo"].setText(infotext)
+                       self["config"].setList(self.list)
+               except AttributeError:
+                       pass
 
        def editTitle(self):
                self.parent.editTitle()
@@ -148,8 +147,7 @@ class LanguageChoices():
 
        def getLanguage(self, DVB_lang):
                DVB_lang = DVB_lang.lower()
-               isocodes = [ ]
-               stripwords = ["stereo", "audio", "description", "2ch"]
+               stripwords = ["stereo", "audio", "description", "2ch", "dolby digital"]
                for word in stripwords:
                        DVB_lang = DVB_lang.replace(word,"").strip()
                for key, val in LanguageCodes.iteritems():

diff --git a/po/de.po b/po/de.po
index 6314a9e96066eb39f841f26808172b32afb48f4b..28e170f8ac8c0abbdf833d2582eecc78715d2034 100755 (executable)
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-07 21:18+0100\n"
-"PO-Revision-Date: 2008-10-15 12:10+0100\n"
+"POT-Creation-Date: 2008-11-13 13:35+0100\n"
+"PO-Revision-Date: 2008-11-13 14:12+0100\n"
 "Last-Translator: Andreas Frisch <andreas.frisch@multimedia-labs.de>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -541,7 +541,7 @@ msgid "Burn DVD"
 msgstr "Brenne DVD"
 
 msgid "Burn existing image to DVD"
-msgstr ""
+msgstr "Vorhandenes Image auf DVD brennen"
 
 msgid "Burn to DVD..."
 msgstr "Auf DVD brennen..."
@@ -704,6 +704,9 @@ msgstr "Compact-Flash-Karte"
 msgid "Complete"
 msgstr "Komplett"
 
+msgid "Complex (allows mixing audio tracks and aspects)"
+msgstr "Komplex (erlaubt Mischen versch. Ton-u. Bildformate)"
+
 msgid "Configuration Mode"
 msgstr "Konfiguration"
 
@@ -757,7 +760,7 @@ msgid "Could not load Medium! No disc inserted?"
 msgstr "Konnte das Medium nicht laden! Keine DVD eingelegt?"
 
 msgid "Create DVD-ISO"
-msgstr ""
+msgstr "DVD-ISO erstellen"
 
 msgid "Create movie folder failed"
 msgstr "Erzeugen des Film-Verzeichnisses fehlgeschlagen"
@@ -1077,6 +1080,9 @@ msgstr "Ost"
 msgid "Edit DNS"
 msgstr "Bearbeite DNS"
 
+msgid "Edit Title"
+msgstr "Titel schneiden"
+
 msgid "Edit chapters of current title"
 msgstr "Kapitel des ausgewählten Titels schneiden"
 
@@ -1390,10 +1396,10 @@ msgid "IP Address"
 msgstr "IP-Adresse"
 
 msgid "ISO file is too large for this filesystem!"
-msgstr ""
+msgstr "Die ISO-Datei passt nicht auf das Dateisystem!"
 
 msgid "ISO path"
-msgstr ""
+msgstr "ISO-Ausgabepfad"
 
 msgid "Icelandic"
 msgstr "Isländisch"
@@ -1522,7 +1528,7 @@ msgid "Italian"
 msgstr "Italienisch"
 
 msgid "Job View"
-msgstr ""
+msgstr "Jobansicht"
 
 #. TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
 msgid "Just Scale"
@@ -2266,6 +2272,9 @@ msgstr "Vorschau des DVD-Menüs"
 msgid "Primary DNS"
 msgstr "Primärer DNS"
 
+msgid "Properties of current title"
+msgstr "Eigenschaften des ausgewählten Titels"
+
 msgid "Protect services"
 msgstr "Kanäle schützen"
 
@@ -2404,6 +2413,9 @@ msgstr "Wiederholungen"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
+msgid "Reset and renumerate title names"
+msgstr "Titelnamen zurücksetzen und neu nummerieren"
+
 msgid "Resolution"
 msgstr "Auflösung"
 
@@ -2765,6 +2777,9 @@ msgstr "Ähnliche Sendungen:"
 msgid "Simple"
 msgstr "Einfach"
 
+msgid "Simple titleset (compatibility for legacy players)"
+msgstr "Schlicht (bessere Kompatibilität mit alten DVD-Playern)"
+
 msgid "Single"
 msgstr "Einzeln"
 
@@ -2938,7 +2953,7 @@ msgid "TRANSLATOR_INFO"
 msgstr ""
 
 msgid "TS file is too large for ISO9660 level 1!"
-msgstr ""
+msgstr "TS-Datei ist zu groß für ISO9660 level 1!"
 
 msgid "TV System"
 msgstr "Fernsehnorm"
@@ -3237,12 +3252,16 @@ msgstr "Zeitzone"
 msgid "Title"
 msgstr "Titel"
 
+msgid "Title properties"
+msgstr "Titeleigensch."
+
 msgid "Title:"
 msgstr "Titel:"
 
-msgid ""
-"To make sure you intend to do this, please remove the target USB stick now "
-"and stick it back in upon prompt. Press OK when you have taken the stick out."
+msgid "Titleset mode"
+msgstr "Titleset"
+
+msgid "To make sure you intend to do this, please remove the target USB stick now and stick it back in upon prompt. Press OK when you have taken the stick out."
 msgstr ""
 
 msgid "Today"
@@ -3866,6 +3885,14 @@ msgstr ""
 "Sind Sie sicher, dass Sie die Sicherung zurückspielen wollen?\n"
 "Sicherung:\n"
 
+#, python-format
+msgid "audio track (%s) format"
+msgstr "Format der Audiospur (%s)"
+
+#, python-format
+msgid "audio track (%s) language"
+msgstr "Sprache der Audiospur (%s)"
+
 msgid "audio tracks"
 msgstr "Tonspuren"
 
@@ -3881,6 +3908,10 @@ msgstr "besser"
 msgid "blacklist"
 msgstr "Negativliste"
 
+#, python-format
+msgid "burn audio track (%s)"
+msgstr "Brenne die Audiospur (%s)"
+
 msgid "by Exif"
 msgstr ""