set wss according to av settings

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 2c8c7db616559726ad7532da424a0d6687b8f648..f6fda3b81f5608cd70de7c48d02cb649ceb3d017 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -17,8 +17,18 @@ class AVSwitch:
                eAVSwitch.getInstance().setVideomode(value)
 
        def setWSS(self, value):
                eAVSwitch.getInstance().setVideomode(value)
 
        def setWSS(self, value):

-               #print "wss:" + str(value)
-               pass
+               if value == 0:
+                       writevalue = "off"
+               elif value == 1:
+                       writevalue = "auto"
+               elif value == 2:
+                       writevalue = "auto(4:3_off)"
+               try:
+                       file = open("/proc/stb/denc/0/wss", "w")
+                       file.write(writevalue)
+                       file.close()
+               except:
+                       print "[AVSwitch.py] Error writing to /proc/stb/denc/0/wss"

        
        def setInput(self, input):
                eAVSwitch.getInstance().setInput(self.INPUT[input])
        
        def setInput(self, input):
                eAVSwitch.getInstance().setInput(self.INPUT[input])


@@ -27,13 +37,13 @@ class AVSwitch:
 
 def InitAVSwitch():
        config.av = ConfigSubsection();
 
 def InitAVSwitch():
        config.av = ConfigSubsection();

-       config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, (("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")) ));
-       config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always"))) );
-       #config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") );
-       config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, (("pal", _("PAL")), ("ntsc", _("NTSC"))) );
-       config.av.wss = configElement("config.av.wss", configSelection, 0, (("enable", _("Enable")), ("disable", _("Disable"))) );
-       config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))));
-       config.av.vcrswitch = configElement("config.av.vcrswitch", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))));
+       config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, (("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")) ))
+       config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always"))) )
+       #config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") )
+       config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, (("pal", _("PAL")), ("ntsc", _("NTSC"))) )
+       config.av.wss = configElement("config.av.wss", configSelection, 0, (("off", _("Off")), ("auto", _("Auto")), ("auto_no4_3", _("Auto (disable on 4:3)"))) )
+       config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))
+       config.av.vcrswitch = configElement("config.av.vcrswitch", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))

 
        iAVSwitch = AVSwitch()
 
 
        iAVSwitch = AVSwitch()
 

diff --git a/po/ar.po b/po/ar.po
index 43011d5b1bcba829ebe6aa362e9bb3e085e878e5..193b937349f3c762b4f5f6f964120a400da1366b 100755 (executable)
--- a/po/ar.po
+++ b/po/ar.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: 2006-01-13 03:53+0100\n"
+"POT-Creation-Date: 2006-01-15 16:28+0100\n"

 "PO-Revision-Date: 2006-01-10 01:17+0300\n"
 "Last-Translator: hazem <moustafagamal@hotmail.com>\n"
 "Language-Team: Arabic <moustafagamal@hotmail.com>\n"
 "PO-Revision-Date: 2006-01-10 01:17+0300\n"
 "Last-Translator: hazem <moustafagamal@hotmail.com>\n"
 "Language-Team: Arabic <moustafagamal@hotmail.com>\n"


@@ -70,7 +70,7 @@ msgstr ""
 msgid "A"
 msgstr "أ"
 
 msgid "A"
 msgstr "أ"
 

-#: ../RecordTimer.py:91
+#: ../RecordTimer.py:125

 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"


@@ -263,7 +263,7 @@ msgstr "إبطال"
 msgid "Do you really want to delete this recording?"
 msgstr "هل تريد مسح هذا التسجيل؟"
 
 msgid "Do you really want to delete this recording?"
 msgstr "هل تريد مسح هذا التسجيل؟"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:798
+#: ../lib/python/Screens/InfoBarGenerics.py:857

 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"


@@ -280,6 +280,10 @@ msgstr ""
 "هل تريد تحديث الدريم بوكس\n"
 "إضغط OK ثم إنتظر!"
 
 "هل تريد تحديث الدريم بوكس\n"
 "إضغط OK ثم إنتظر!"
 

+#: ../lib/python/Components/Language.py:15
+msgid "Dutch"
+msgstr ""
+

 #: ../lib/python/Screens/ChannelSelection.py:368
 msgid "E"
 msgstr "O"
 #: ../lib/python/Screens/ChannelSelection.py:368
 msgid "E"
 msgstr "O"


@@ -456,10 +460,6 @@ msgstr "الاسم"
 msgid "Nameserver"
 msgstr "اسم السيرفر"
 
 msgid "Nameserver"
 msgstr "اسم السيرفر"
 

-#: ../lib/python/Components/Language.py:15
-msgid "Netherlands"
-msgstr ""
-

 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr ""
 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr ""


@@ -476,7 +476,7 @@ msgstr "التالى"
 msgid "No"
 msgstr "لا"
 
 msgid "No"
 msgstr "لا"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:794
+#: ../lib/python/Screens/InfoBarGenerics.py:853

 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "لا يوجد قرص صلب\n"
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "لا يوجد قرص صلب\n"


@@ -587,7 +587,7 @@ msgstr "مقدم الخدمه"
 msgid "Providers"
 msgstr "مقدمو الخدمه"
 
 msgid "Providers"
 msgstr "مقدمو الخدمه"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:847
+#: ../lib/python/Screens/InfoBarGenerics.py:906

 msgid "Record"
 msgstr "تسجيل"
 
 msgid "Record"
 msgstr "تسجيل"
 


@@ -651,7 +651,7 @@ msgstr "جنوب"
 msgid "Start"
 msgstr "أبـدأ"
 
 msgid "Start"
 msgstr "أبـدأ"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:800
+#: ../lib/python/Screens/InfoBarGenerics.py:859

 msgid "Start recording?"
 msgstr "أبـدأ التسجيل؟"
 
 msgid "Start recording?"
 msgstr "أبـدأ التسجيل؟"
 


@@ -671,7 +671,7 @@ msgstr "إيقاف عرض هذا الفيلم؟"
 msgid "Stored position"
 msgstr "الوضع المخزن"
 
 msgid "Stored position"
 msgstr "الوضع المخزن"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:852 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:911 ../data/

 msgid "Subservices"
 msgstr "الخدمات الفرعيه"
 
 msgid "Subservices"
 msgstr "الخدمات الفرعيه"
 


@@ -706,6 +706,10 @@ msgstr "الخميس"
 msgid "Timer Type"
 msgstr "نوع المؤقت"
 
 msgid "Timer Type"
 msgstr "نوع المؤقت"
 

+#: ../lib/python/Screens/InfoBarGenerics.py:759
+msgid "Timeshift not possible!"
+msgstr ""
+

 #: ../lib/python/Screens/Satconfig.py:71
 msgid "Tone mode"
 msgstr ""
 #: ../lib/python/Screens/Satconfig.py:71
 msgid "Tone mode"
 msgstr ""


@@ -1002,7 +1006,7 @@ msgstr ""
 "بتم البحث الان %d %%\n"
 "%d تم العثور على"
 
 "بتم البحث الان %d %%\n"
 "%d تم العثور على"
 

-#: ../lib/python/Screens/ServiceScan.py:22
+#: ../lib/python/Screens/ServiceScan.py:23

 msgid "scan state"
 msgstr "حاله البحث"
 
 msgid "scan state"
 msgstr "حاله البحث"
 

diff --git a/po/de.po b/po/de.po
index 927140ed0fe2c0e5ee6541b6ec9242d065676f75..6a8cc7e1e8d8c23465da18ebd8101e9734751616 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: 2006-01-13 03:53+0100\n"
+"POT-Creation-Date: 2006-01-15 16:28+0100\n"

 "PO-Revision-Date: 2005-12-14 03:29+0100\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2005-12-14 03:29+0100\n"
 "Last-Translator: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>\n"
 "Language-Team: none\n"


@@ -70,7 +70,7 @@ msgstr ""
 msgid "A"
 msgstr ""
 
 msgid "A"
 msgstr ""
 

-#: ../RecordTimer.py:91
+#: ../RecordTimer.py:125

 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"


@@ -263,7 +263,7 @@ msgstr "Aus"
 msgid "Do you really want to delete this recording?"
 msgstr "Wollen Sie diese Aufnahme wirklich löschen?"
 
 msgid "Do you really want to delete this recording?"
 msgstr "Wollen Sie diese Aufnahme wirklich löschen?"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:798
+#: ../lib/python/Screens/InfoBarGenerics.py:857

 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"


@@ -280,6 +280,10 @@ msgstr ""
 "Möchten Sie Ihre Dreambox updaten?\n"
 "Nach dem Druck auf OK bitte warten!"
 
 "Möchten Sie Ihre Dreambox updaten?\n"
 "Nach dem Druck auf OK bitte warten!"
 

+#: ../lib/python/Components/Language.py:15
+msgid "Dutch"
+msgstr ""
+

 #: ../lib/python/Screens/ChannelSelection.py:368
 msgid "E"
 msgstr "O"
 #: ../lib/python/Screens/ChannelSelection.py:368
 msgid "E"
 msgstr "O"


@@ -456,10 +460,6 @@ msgstr ""
 msgid "Nameserver"
 msgstr ""
 
 msgid "Nameserver"
 msgstr ""
 

-#: ../lib/python/Components/Language.py:15
-msgid "Netherlands"
-msgstr ""
-

 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr "Netzmaske"
 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr "Netzmaske"


@@ -476,7 +476,7 @@ msgstr ""
 msgid "No"
 msgstr "Nein"
 
 msgid "No"
 msgstr "Nein"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:794
+#: ../lib/python/Screens/InfoBarGenerics.py:853

 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Keine Festplatte gefunden oder\n"
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Keine Festplatte gefunden oder\n"


@@ -509,7 +509,7 @@ msgstr ""
 
 #: ../lib/python/Components/NimManager.py:661
 msgid "Off"
 
 #: ../lib/python/Components/NimManager.py:661
 msgid "Off"

-msgstr "Auf"
+msgstr "Aus"

 
 #: ../lib/python/Components/NimManager.py:661
 msgid "On"
 
 #: ../lib/python/Components/NimManager.py:661
 msgid "On"


@@ -587,7 +587,7 @@ msgstr "Provider"
 msgid "Providers"
 msgstr "Anbieter"
 
 msgid "Providers"
 msgstr "Anbieter"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:847
+#: ../lib/python/Screens/InfoBarGenerics.py:906

 msgid "Record"
 msgstr "Aufnahme"
 
 msgid "Record"
 msgstr "Aufnahme"
 


@@ -651,7 +651,7 @@ msgstr "Süd"
 msgid "Start"
 msgstr ""
 
 msgid "Start"
 msgstr ""
 

-#: ../lib/python/Screens/InfoBarGenerics.py:800
+#: ../lib/python/Screens/InfoBarGenerics.py:859

 msgid "Start recording?"
 msgstr "Aufnahme beginnen?"
 
 msgid "Start recording?"
 msgstr "Aufnahme beginnen?"
 


@@ -671,7 +671,7 @@ msgstr "Das Abspielen dieses Films beenden?"
 msgid "Stored position"
 msgstr ""
 
 msgid "Stored position"
 msgstr ""
 

-#: ../lib/python/Screens/InfoBarGenerics.py:852 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:911 ../data/

 msgid "Subservices"
 msgstr "Unterkanäle"
 
 msgid "Subservices"
 msgstr "Unterkanäle"
 


@@ -706,6 +706,10 @@ msgstr "Donnerstag"
 msgid "Timer Type"
 msgstr "Timer-Art"
 
 msgid "Timer Type"
 msgstr "Timer-Art"
 

+#: ../lib/python/Screens/InfoBarGenerics.py:759
+msgid "Timeshift not possible!"
+msgstr ""
+

 #: ../lib/python/Screens/Satconfig.py:71
 msgid "Tone mode"
 msgstr ""
 #: ../lib/python/Screens/Satconfig.py:71
 msgid "Tone mode"
 msgstr ""


@@ -1004,7 +1008,7 @@ msgstr ""
 "Suche läuft - %d %% erledigt!\n"
 "%d Kanäle gefunden!"
 
 "Suche läuft - %d %% erledigt!\n"
 "%d Kanäle gefunden!"
 

-#: ../lib/python/Screens/ServiceScan.py:22
+#: ../lib/python/Screens/ServiceScan.py:23

 msgid "scan state"
 msgstr "Status"
 
 msgid "scan state"
 msgstr "Status"
 

diff --git a/po/nl.po b/po/nl.po
index 17abb55f3ee7612c8fc5ff5c59ec807720d9e95a..a45c41e43c2dabdce5c0cd633cf11ff0f5a09c07 100755 (executable)
--- a/po/nl.po
+++ b/po/nl.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: 2006-01-13 03:53+0100\n"
+"POT-Creation-Date: 2006-01-15 16:28+0100\n"

 "PO-Revision-Date: 2005-12-14 03:29+0100\n"
 "Last-Translator: Kees Aerts <aerts11@planet.nl>\n"
 "Language-Team: none\n"
 "PO-Revision-Date: 2005-12-14 03:29+0100\n"
 "Last-Translator: Kees Aerts <aerts11@planet.nl>\n"
 "Language-Team: none\n"


@@ -70,7 +70,7 @@ msgstr ""
 msgid "A"
 msgstr ""
 
 msgid "A"
 msgstr ""
 

-#: ../RecordTimer.py:91
+#: ../RecordTimer.py:125

 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"
 msgid ""
 "A timer failed to record!\n"
 "Disable TV and try again?\n"


@@ -263,7 +263,7 @@ msgstr "Uit"
 msgid "Do you really want to delete this recording?"
 msgstr "Wilt u deze opname werkelijk wissen?"
 
 msgid "Do you really want to delete this recording?"
 msgstr "Wilt u deze opname werkelijk wissen?"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:798
+#: ../lib/python/Screens/InfoBarGenerics.py:857

 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"
 msgid ""
 "Do you want to stop the current\n"
 "(instant) recording?"


@@ -280,6 +280,10 @@ msgstr ""
 "Wilt u de dreambox updaten?\n"
 "Druk op OK en wacht een momment!"
 
 "Wilt u de dreambox updaten?\n"
 "Druk op OK en wacht een momment!"
 

+#: ../lib/python/Components/Language.py:15
+msgid "Dutch"
+msgstr ""
+

 #: ../lib/python/Screens/ChannelSelection.py:368
 msgid "E"
 msgstr "O"
 #: ../lib/python/Screens/ChannelSelection.py:368
 msgid "E"
 msgstr "O"


@@ -456,10 +460,6 @@ msgstr ""
 msgid "Nameserver"
 msgstr ""
 
 msgid "Nameserver"
 msgstr ""
 

-#: ../lib/python/Components/Language.py:15
-msgid "Netherlands"
-msgstr ""
-

 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr "Netmask"
 #: ../lib/python/Screens/NetworkSetup.py:44 ../data/
 msgid "Netmask"
 msgstr "Netmask"


@@ -476,7 +476,7 @@ msgstr ""
 msgid "No"
 msgstr "Nee"
 
 msgid "No"
 msgstr "Nee"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:794
+#: ../lib/python/Screens/InfoBarGenerics.py:853

 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Geen Harddisk gevonden of\n"
 msgid "No HDD found or HDD not initialized!"
 msgstr ""
 "Geen Harddisk gevonden of\n"


@@ -587,7 +587,7 @@ msgstr "Provider"
 msgid "Providers"
 msgstr "Providers"
 
 msgid "Providers"
 msgstr "Providers"
 

-#: ../lib/python/Screens/InfoBarGenerics.py:847
+#: ../lib/python/Screens/InfoBarGenerics.py:906

 msgid "Record"
 msgstr "Opnemen"
 
 msgid "Record"
 msgstr "Opnemen"
 


@@ -651,7 +651,7 @@ msgstr "Zuid"
 msgid "Start"
 msgstr ""
 
 msgid "Start"
 msgstr ""
 

-#: ../lib/python/Screens/InfoBarGenerics.py:800
+#: ../lib/python/Screens/InfoBarGenerics.py:859

 msgid "Start recording?"
 msgstr "Start Opnemen?"
 
 msgid "Start recording?"
 msgstr "Start Opnemen?"
 


@@ -671,7 +671,7 @@ msgstr "Stop afspelen deze film?"
 msgid "Stored position"
 msgstr ""
 
 msgid "Stored position"
 msgstr ""
 

-#: ../lib/python/Screens/InfoBarGenerics.py:852 ../data/
+#: ../lib/python/Screens/InfoBarGenerics.py:911 ../data/

 msgid "Subservices"
 msgstr "Subservices"
 
 msgid "Subservices"
 msgstr "Subservices"
 


@@ -706,6 +706,10 @@ msgstr "Donderdag"
 msgid "Timer Type"
 msgstr "Timer-Type"
 
 msgid "Timer Type"
 msgstr "Timer-Type"
 

+#: ../lib/python/Screens/InfoBarGenerics.py:759
+msgid "Timeshift not possible!"
+msgstr ""
+

 #: ../lib/python/Screens/Satconfig.py:71
 msgid "Tone mode"
 msgstr ""
 #: ../lib/python/Screens/Satconfig.py:71
 msgid "Tone mode"
 msgstr ""


@@ -1000,7 +1004,7 @@ msgid ""
 "%d services found!"
 msgstr ""
 
 "%d services found!"
 msgstr ""
 

-#: ../lib/python/Screens/ServiceScan.py:22
+#: ../lib/python/Screens/ServiceScan.py:23

 msgid "scan state"
 msgstr "Status"
 
 msgid "scan state"
 msgstr "Status"