translations

diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py
index 6ce8737ba50bffb0b2dbf21621d0aae920f4f72a..2c5990a9cd90adc07862c02f65b1cfd750467b69 100644 (file)
--- a/lib/python/Components/SetupDevices.py
+++ b/lib/python/Components/SetupDevices.py
@@ -18,10 +18,10 @@ def InitSetupDevices():
        config.timezone.val.addNotifier(timezoneNotifier)
 
        config.rc = ConfigSubsection();
        config.timezone.val.addNotifier(timezoneNotifier)
 
        config.rc = ConfigSubsection();

-       config.rc.map = configElement("config.rc.map", configSelection, 0, ("Default", "Classic") );
+       config.rc.map = configElement("config.rc.map", configSelection, 0, (_("Default"), _("Classic")) );

 
        config.keyboard = ConfigSubsection();
 
        config.keyboard = ConfigSubsection();

-       config.keyboard.keymap = configElement("config.keyboard.keymap", configSelection, 1, ("English", "German") );
+       config.keyboard.keymap = configElement("config.keyboard.keymap", configSelection, 1, (_("English"), _("German")) );

 
        config.osd = ConfigSubsection();
        config.osd.alpha = configElement("config.osd.alpha", ConfigSlider, 0, "");
 
        config.osd = ConfigSubsection();
        config.osd.alpha = configElement("config.osd.alpha", ConfigSlider, 0, "");


@@ -35,13 +35,13 @@ def InitSetupDevices():
        config.osd.language.addNotifier(languageNotifier)
 
        config.parental = ConfigSubsection();
        config.osd.language.addNotifier(languageNotifier)
 
        config.parental = ConfigSubsection();

-       config.parental.lock = configElement("config.parental.lock", configSelection, 1, ("Enable", "Disable") );
-       config.parental.setuplock = configElement("config.parental.setuplock", configSelection, 1, ("Enable", "Disable") );
+       config.parental.lock = configElement("config.parental.lock", configSelection, 1, (_("Enable"), _("Disable")) );
+       config.parental.setuplock = configElement("config.parental.setuplock", configSelection, 1, (_("Enable"), _("Disable")) );

 
        config.expert = ConfigSubsection();
        config.expert.splitsize = configElement("config.expert.splitsize", configSelection, 1, ("0.5Gbyte", "1.0 GByte", "1.5 GByte", "2.0 GByte") );
 
        config.expert = ConfigSubsection();
        config.expert.splitsize = configElement("config.expert.splitsize", configSelection, 1, ("0.5Gbyte", "1.0 GByte", "1.5 GByte", "2.0 GByte") );

-       config.expert.satpos = configElement("config.expert.satpos", configSelection, 1, ("Enable", "Disable") );
-       config.expert.fastzap = configElement("config.expert.fastzap", configSelection, 0, ("Enable", "Disable") );
-       config.expert.skipconfirm = configElement("config.expert.skipconfirm", configSelection, 1, ("Enable", "Disable") );
-       config.expert.hideerrors = configElement("config.expert.hideerrors", configSelection, 1, ("Enable", "Disable") );
-       config.expert.autoinfo = configElement("config.expert.autoinfo", configSelection, 1, ("Enable", "Disable") );
+       config.expert.satpos = configElement("config.expert.satpos", configSelection, 1, (_("Enable"), _("Disable")) );
+       config.expert.fastzap = configElement("config.expert.fastzap", configSelection, 0, (_("Enable"), _("Disable")) );
+       config.expert.skipconfirm = configElement("config.expert.skipconfirm", configSelection, 1, (_("Enable"), _("Disable")) );
+       config.expert.hideerrors = configElement("config.expert.hideerrors", configSelection, 1, (_("Enable"), _("Disable")) );
+       config.expert.autoinfo = configElement("config.expert.autoinfo", configSelection, 1, (_("Enable"), _("Disable")) );

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 5359b26b49c0e762a6c37220165c96eb27fefd07..2e267a07b232242b44d2909f19378db34df2758a 100644 (file)
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -11,7 +11,7 @@ class About(Screen):
                
                self["text"] = Label("Enigma v2.0b")
 
                
                self["text"] = Label("Enigma v2.0b")
 

-               self["tuner"] = Label("Detected NIMs:")
+               self["tuner"] = Label(_("Detected NIMs:"))

                
                nims = nimmanager.nimList()
                count = 0
                
                nims = nimmanager.nimList()
                count = 0


@@ -19,12 +19,12 @@ class About(Screen):
                        self["tuner" + str(count)] = Label(i[0])
                        count += 1
 
                        self["tuner" + str(count)] = Label(i[0])
                        count += 1
 

-               self["hdd"] = Label("Detected HDD:")
+               self["hdd"] = Label(_("Detected HDD:"))

                hdd = Harddisk(0)
                if hdd.model() != "":
                hdd = Harddisk(0)
                if hdd.model() != "":

-                       self["hddA"] = Label("%s (%s, %d MB free)" % (hdd.model(), hdd.capacity(),hdd.free()))
+                       self["hddA"] = Label(_("%s (%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))

                else:                   
                else:                   

-                       self["hddA"] = Label("none")
+                       self["hddA"] = Label(_("none"))

 
                self["actions"] = ActionMap(["SetupActions"], 
                        {
 
                self["actions"] = ActionMap(["SetupActions"], 
                        {

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index fe34f4aaf69967ca9b4febef45edde79091c4681..7217cb72af7ea38df6a795fce506492985f0ca0b 100644 (file)
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -29,7 +29,7 @@ class CiWait(Screen):
        def __init__(self, session, slot, query):
                Screen.__init__(self, session)
 
        def __init__(self, session, slot, query):
                Screen.__init__(self, session)
 

-               self["message"] = Label("waiting for CI...")
+               self["message"] = Label(_("waiting for CI..."))

 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {
 
                self["actions"] = ActionMap(["OkCancelActions"], 
                        {

diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index b8ad1e0efca00a422639c8a7de6490af41c26f05..f7c77e711d6cf94ada5846c1ad7cc73660ac88d1 100644 (file)
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -40,7 +40,7 @@ class EventView(Screen):
                if name is not None:
                        self["channel"].setText(name)
                else:
                if name is not None:
                        self["channel"].setText(name)
                else:

-                       self["channel"].setText("unknown service")
+                       self["channel"].setText(_("unknown service"))

 
        def setEvent(self, event):
                text = event.getEventName()
 
        def setEvent(self, event):
                text = event.getEventName()


@@ -55,7 +55,7 @@ class EventView(Screen):
 #              self.session.currentDialog.instance.setTitle(event.getEventName())
                self["epg_description"].setText(text)
                self["datetime"].setText(event.getBeginTimeString())
 #              self.session.currentDialog.instance.setTitle(event.getEventName())
                self["epg_description"].setText(text)
                self["datetime"].setText(event.getBeginTimeString())

-               self["duration"].setText("%d min"%(event.getDuration()/60))
+               self["duration"].setText(_("%d min")%(event.getDuration()/60))

 
        def pageUp(self):
                self["epg_description"].pageUp()
 
        def pageUp(self):
                self["epg_description"].pageUp()

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 73e3d6464785cc1610a0b2e8ce69c2490918f16b..3e90d4fb0dc6cf6d0cb78f0917e3e04516accfcf 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -15,7 +15,7 @@ class HarddiskWait(Screen):
        def __init__(self, session, hdd):
                Screen.__init__(self, session)
                self.hdd = hdd
        def __init__(self, session, hdd):
                Screen.__init__(self, session)
                self.hdd = hdd

-               self["wait"] = Label("Initializing Harddisk...");
+               self["wait"] = Label(_("Initializing Harddisk..."));

                self.timer = eTimer()
                self.timer.timeout.get().append(self.doInit)
                self.timer.start(100)
                self.timer = eTimer()
                self.timer.timeout.get().append(self.doInit)
                self.timer.start(100)


@@ -25,10 +25,10 @@ class HarddiskSetup(Screen):
                Screen.__init__(self, session)
                self.hdd = hdd
                
                Screen.__init__(self, session)
                self.hdd = hdd
                

-               self["model"] = Label("Model: " + hdd.model())
-               self["capacity"] = Label("Capacity: " + hdd.capacity())
-               self["bus"] = Label("Bus: " + hdd.bus())
-               self["initialize"] = Label("Initialize")
+               self["model"] = Label(_("Model: ") + hdd.model())
+               self["capacity"] = Label(_("Capacity: ") + hdd.capacity())
+               self["bus"] = Label(_("Bus: ") + hdd.bus())
+               self["initialize"] = Label(_("Initialize"))

 
                self["actions"] = ActionMap(["OkCancelActions"],
                {
 
                self["actions"] = ActionMap(["OkCancelActions"],
                {


@@ -54,7 +54,7 @@ class HarddiskSelection(Screen):
                
                if harddiskmanager.HDDCount() == 0:
                        tlist = []
                
                if harddiskmanager.HDDCount() == 0:
                        tlist = []

-                       tlist.append(("no HDD found", 0))
+                       tlist.append((_("no HDD found"), 0))

                        self["hddlist"] = MenuList(tlist)
                else:                   
                        self["hddlist"] = MenuList(harddiskmanager.HDDList())
                        self["hddlist"] = MenuList(tlist)
                else:                   
                        self["hddlist"] = MenuList(harddiskmanager.HDDList())

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 204c6a809aaf0ae65ddad215ee3ca01d3c3ab8eb..ffbad26088c17af72a73419ed1e5f44360c2f541 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -54,7 +54,7 @@ class NimSetup(Screen):
 
        def keyRight(self):
                #forbid to enable advanced mode until its ready
 
        def keyRight(self):
                #forbid to enable advanced mode until its ready

-               if self["config"].getCurrent()[0] != "Configmode":
+               if self["config"].getCurrent()[0] != _("Configmode"):

                        self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 
                        self["config"].handleKey(config.key["nextElement"])
                self.newConfig()
 

diff --git a/po/Makefile b/po/Makefile
index 2cc9f9b9da4ae58b0ef378e0a988ac4547bf44d5..5fe5e2f5db985c1e81ff2bfd9a7236312f68fd34 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -23,8 +23,12 @@ enigma2.pot:
                        ../lib/python/Screens/ScanSetup.py \
                        ../lib/python/Screens/NetworkSetup.py \
                        ../lib/python/Screens/Satconfig.py \
                        ../lib/python/Screens/ScanSetup.py \
                        ../lib/python/Screens/NetworkSetup.py \
                        ../lib/python/Screens/Satconfig.py \

-                       ../lib/python/Components/Language.py \
-                       ../data/menu.xml 
+                       ../lib/python/Screens/EventView.py \
+                       ../lib/python/Screens/Ci.py \
+                       ../lib/python/Screens/About.py \
+                       ../lib/python/Screens/HarddiskSetup.py \
+                       ../lib/python/Components/SetupDevices.py \
+                       ../lib/python/Components/Language.py 

                        
 
 
                        
 
 

diff --git a/po/de.po b/po/de.po
index 5246a3e758aaf1c0ab612b222aa03cfe490a2489..b79a3e4901fc5fae7e9a2bc7d51c88df192c8ae6 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-11-17 22:11+0100\n"
+"POT-Creation-Date: 2005-11-17 22:41+0100\n"

 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"


@@ -16,14 +16,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

+#: ../lib/python/Screens/EventView.py:58
+#, python-format
+msgid "%d min"
+msgstr ""
+
+#: ../lib/python/Screens/About.py:25
+#, python-format
+msgid "%s (%s, %d MB free)"
+msgstr ""
+
+#: ../lib/python/Screens/HarddiskSetup.py:30
+msgid "Bus: "
+msgstr "Personennahverkehr: "
+
+#: ../lib/python/Screens/HarddiskSetup.py:29
+msgid "Capacity: "
+msgstr "Kapazitaet: "
+
+#: ../lib/python/Components/SetupDevices.py:21
+msgid "Classic"
+msgstr "klassisch"
+

 #: ../lib/python/Screens/Satconfig.py:30 ../lib/python/Screens/Satconfig.py:48
 #: ../lib/python/Screens/Satconfig.py:30 ../lib/python/Screens/Satconfig.py:48

+#: ../lib/python/Screens/Satconfig.py:57

 msgid "Configmode"
 msgstr "Konfigurationsmodus"
 
 msgid "Configmode"
 msgstr "Konfigurationsmodus"
 

+#: ../lib/python/Components/SetupDevices.py:21
+msgid "Default"
+msgstr "Standard"
+
+#: ../lib/python/Screens/About.py:22
+msgid "Detected HDD:"
+msgstr "Erkannte Festplatten:"
+
+#: ../lib/python/Screens/About.py:14
+msgid "Detected NIMs:"
+msgstr "Erkannte Tuner:"
+
+#: ../lib/python/Components/SetupDevices.py:38
+#: ../lib/python/Components/SetupDevices.py:39
+#: ../lib/python/Components/SetupDevices.py:43
+#: ../lib/python/Components/SetupDevices.py:44
+#: ../lib/python/Components/SetupDevices.py:45
+#: ../lib/python/Components/SetupDevices.py:46
+#: ../lib/python/Components/SetupDevices.py:47
+msgid "Disable"
+msgstr "Aus"
+

 #: ../lib/python/Screens/Satconfig.py:33 ../lib/python/Screens/Satconfig.py:46
 msgid "Diseqcmode"
 msgstr "Diseqc-Modus"
 
 #: ../lib/python/Screens/Satconfig.py:33 ../lib/python/Screens/Satconfig.py:46
 msgid "Diseqcmode"
 msgstr "Diseqc-Modus"
 

+#: ../lib/python/Components/SetupDevices.py:38
+#: ../lib/python/Components/SetupDevices.py:39
+#: ../lib/python/Components/SetupDevices.py:43
+#: ../lib/python/Components/SetupDevices.py:44
+#: ../lib/python/Components/SetupDevices.py:45
+#: ../lib/python/Components/SetupDevices.py:46
+#: ../lib/python/Components/SetupDevices.py:47
+msgid "Enable"
+msgstr "Ein"
+
+#: ../lib/python/Components/SetupDevices.py:24

 #: ../lib/python/Components/Language.py:9
 msgid "English"
 msgstr "Englisch"
 #: ../lib/python/Components/Language.py:9
 msgid "English"
 msgstr "Englisch"


@@ -36,6 +92,7 @@ msgstr "Frequenz"
 msgid "Gateway"
 msgstr ""
 
 msgid "Gateway"
 msgstr ""
 

+#: ../lib/python/Components/SetupDevices.py:24

 #: ../lib/python/Components/Language.py:10
 msgid "German"
 msgstr "Deutsch"
 #: ../lib/python/Components/Language.py:10
 msgid "German"
 msgstr "Deutsch"


@@ -44,17 +101,29 @@ msgstr "Deutsch"
 msgid "IP Address"
 msgstr "IP Adresse"
 
 msgid "IP Address"
 msgstr "IP Adresse"
 

+#: ../lib/python/Screens/HarddiskSetup.py:31
+msgid "Initialize"
+msgstr "Initialisiere"
+
+#: ../lib/python/Screens/HarddiskSetup.py:18
+msgid "Initializing Harddisk..."
+msgstr "Initialisiere Festplatte..."
+

 #: ../lib/python/Screens/ScanSetup.py:77
 msgid "Inversion"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:24
 msgid "Latitude"
 #: ../lib/python/Screens/ScanSetup.py:77
 msgid "Inversion"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:24
 msgid "Latitude"

-msgstr ""
+msgstr "Breitengrad"

 
 #: ../lib/python/Screens/Satconfig.py:23
 msgid "Longitude"
 
 #: ../lib/python/Screens/Satconfig.py:23
 msgid "Longitude"

-msgstr "Breitengrad"
+msgstr "Laengengrad"
+
+#: ../lib/python/Screens/HarddiskSetup.py:28
+msgid "Model: "
+msgstr "Modell: "

 
 #: ../lib/python/Screens/NetworkSetup.py:45
 msgid "Nameserver"
 
 #: ../lib/python/Screens/NetworkSetup.py:45
 msgid "Nameserver"


@@ -87,3 +156,19 @@ msgstr "Satellit"
 #: ../lib/python/Screens/ScanSetup.py:78
 msgid "Symbolrate"
 msgstr ""
 #: ../lib/python/Screens/ScanSetup.py:78
 msgid "Symbolrate"
 msgstr ""

+
+#: ../lib/python/Screens/HarddiskSetup.py:57
+msgid "no HDD found"
+msgstr "keine Festplatte gefunden"
+
+#: ../lib/python/Screens/About.py:27
+msgid "none"
+msgstr ""
+
+#: ../lib/python/Screens/EventView.py:43
+msgid "unknown service"
+msgstr "unbekannter Dienst"
+
+#: ../lib/python/Screens/Ci.py:32
+msgid "waiting for CI..."
+msgstr "warte auf das CI..."