git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2346f00)
some spelling fixes
authorAndreas Oberritter <obi@opendreambox.org>
Thu, 15 Dec 2005 14:51:43 +0000 (14:51 +0000)
committerAndreas Oberritter <obi@opendreambox.org>
Thu, 15 Dec 2005 14:51:43 +0000 (14:51 +0000)
data/menu.xml patch | blob | history
data/setup.xml patch | blob | history
data/skin.xml patch | blob | history
data/startwizard.xml patch | blob | history
lib/python/Screens/HarddiskSetup.py patch | blob | history
lib/python/Screens/ScanSetup.py patch | blob | history
lib/python/Screens/TimerEntry.py patch | blob | history
po/de.po patch | blob | history

diff --git a/data/menu.xml b/data/menu.xml
index c60ed0ef9c7f65d57d11bc6b6113bae6c3c0f8ea..dabdd76e4ba5d1746773fc460409a0125d900f7a 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -14,7 +14,7 @@
                "exec"s code
 -->
                <!--<item text="Standby debug">quitMainloop(0)</item>
-               <item text="Networksetup">self.openSetup("network")</item>-->
+               <item text="Network setup">self.openSetup("network")</item>-->
                <!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
                <!--<item text="Radio"><code>print "radio mode"</code></item>-->
                <item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
diff --git a/data/setup.xml b/data/setup.xml
index 173aac4925dacb23d7b27b5855485e22faf25837..371955615b288c88e78778f6da4c77343e85e491 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -15,7 +15,7 @@
                        <item text="AC3 default">config.av.defaultac3</item>
                        <item text="VCR Switch">config.av.vcrswitch</item>
                </setup>
-               <setup key="network" title="Networksetup">
+               <setup key="network" title="Network setup">
                        <item text="Use DHCP">config.network.dhcp</item>
                        <item text="IP Address">config.network.ip</item>
                        <item text="Netmask">config.network.netmask</item>                      
@@ -26,7 +26,7 @@
                </setup>
                <setup key="RFmod" title="UHF Modulator">
                        <item text="Modulator">config.rfmod.enable</item>
-                       <item text="Testmode">config.rfmod.test</item>
+                       <item text="Test mode">config.rfmod.test</item>
                        <item text="Sound">config.rfmod.sound</item>
                        <item text="Soundcarrier">config.rfmod.soundcarrier</item>
                        <item text="Channel">config.rfmod.channel</item>
@@ -60,7 +60,7 @@
                        <item text="Auto show inforbar">config.expert.autoinfo</item>
                </setup>
                <setup key="satconfig" title="Sat / Dish Setup">
-                       <item text="Tuner-Slot">config.sat.tunerslot</item>
+                       <item text="Tuner Slot">config.sat.tunerslot</item>
                        <item text="Configuration Mode">config.sat.configmode</item>
                        <item text="DiSEqC">config.sat.diseqc</item>
                        <item text="Longitude">config.sat.diseqca</item>
diff --git a/data/skin.xml b/data/skin.xml
index a7ac4b01ce886db540e48e73836bab1475d2df6d..c69231280284f106864cfadda88400ed27139449 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -250,7 +250,7 @@
                        <widget name="duration" position="140,345" size="100,30" font="Arial;22" />
                        <widget name="channel" position="240,345" size="270,30" font="Arial;22" />
                </screen>
-               <screen name="MovieSelection" position="90,98" size="560,415" title="Select-a-movie">
+               <screen name="MovieSelection" position="90,98" size="560,415" title="Select a movie">
                        <widget name="list" position="0,0" size="560,375" scrollbarMode="showOnDemand" />
                        <widget name="freeDiskSpace" position="10,380" size="540,30" font="Arial;25" />
                </screen>
diff --git a/data/startwizard.xml b/data/startwizard.xml
index 9d537f52c9a6fc86621a8008ad623621b838b282..ae181f4d71cbd8020177616083cb227e09b667f0 100644 (file)
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,6 +1,6 @@
 <wizard>
                <step number="1">
-                       <text value="Welcome.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\nPress the OK button on your remote control to move to the next step." />
+                       <text value="Welcome.\n\nThis start wizard will guide you through the basic setup of your Dreambox.\nPress the OK button on your remote control to move to the next step." />
                        <code>
 self["arrowdown"].moveTo(557, 232, 1)
 self["arrowdown"].startMoving()
diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 1f936010340e167ffe31dad8c7d64dd366b2f449..72480ce852ff08b182fada8077f2b105830d49ba 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -44,7 +44,7 @@ class HarddiskSetup(Screen):
        def hddReady(self, result):
                print "Result: " + str(result)
                if (result != 0):
-                       self.session.open(MessageBox, _("Unable to initialize harddisk.\nPlease refer to the user-manual.\nError: ") + str(self.hdd.errorList[0 - result]))
+                       self.session.open(MessageBox, _("Unable to initialize harddisk.\nPlease refer to the user manual.\nError: ") + str(self.hdd.errorList[0 - result]))
                else:
                        self.close()
                        
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 648e6e7fd1f68fea04520a88e1d0356dba7b8e37..06fb24c0be7887f5f10530e0d1281ad7d814da69 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -86,7 +86,7 @@ class ScanSetup(Screen):
                                self.list.append(getConfigListEntry(_('Satellite'), config.scan.satselection[config.scan.nims.value]))
                                self.list.append(getConfigListEntry(_('Frequency'), config.scan.sat.frequency))
                                self.list.append(getConfigListEntry(_('Inversion'), config.scan.sat.inversion))
-                               self.list.append(getConfigListEntry(_('Symbolrate'), config.scan.sat.symbolrate))
+                               self.list.append(getConfigListEntry(_('Symbol Rate'), config.scan.sat.symbolrate))
                                self.list.append(getConfigListEntry(_("Polarity"), config.scan.sat.polarization))
                                self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec))
                        if (config.scan.type.value == 1): # single satellite scan
@@ -113,7 +113,7 @@ class ScanSetup(Screen):
                        if (config.scan.typecable.value == 0): # single transponder
                                self.list.append(getConfigListEntry(_("Frequency"), config.scan.cab.frequency))
                                self.list.append(getConfigListEntry(_("Inversion"), config.scan.cab.inversion))
-                               self.list.append(getConfigListEntry(_("Symbolrate"), config.scan.cab.symbolrate))
+                               self.list.append(getConfigListEntry(_("Symbol Rate"), config.scan.cab.symbolrate))
                                self.list.append(getConfigListEntry(_("Modulation"), config.scan.cab.modulation))
                                self.list.append(getConfigListEntry(_("FEC"), config.scan.cab.fec))
                        if (config.scan.typecable.value == 1): # complete
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 781e8bf18ddaa0f3fe7c645e67799282fce6e137..643726256806586853197c43d9eb1e58bc3b53c0 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -59,13 +59,13 @@ class TimerEntry(Screen):
                                        repeated = 0 # daily
                                else:
                                        flags = self.timer.repeated
-                                       repeated = 3 # user-defined
+                                       repeated = 3 # user defined
                                        count = 0
                                        for x in range(0, 7):
                                                if (flags == 1): # weekly
                                                        print "Set to weekday " + str(x)
                                                        weekday = x
-                                               if (flags & 1 == 1): # set user-defined flags
+                                               if (flags & 1 == 1): # set user defined flags
                                                        day[x] = 0
                                                        count += 1
                                                else:
@@ -80,7 +80,7 @@ class TimerEntry(Screen):
                        config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, (_("once"), _("repeated")))
                        config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback))
 
-                       config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user-defined")))
+                       config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user defined")))
 
                        config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, self.timer.begin, (_("%d.%B %Y"), 86400))
                        config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.begin))), int(time.strftime("%M", time.localtime(self.timer.begin)))], configsequencearg.get("CLOCK"))
@@ -127,7 +127,7 @@ class TimerEntry(Screen):
        def createSetup(self):
                self.list = []
                self.list.append(getConfigListEntry(_("Description"), config.timerentry.description))
-               self.list.append(getConfigListEntry(_("TimerType"), config.timerentry.type))
+               self.list.append(getConfigListEntry(_("Timer Type"), config.timerentry.type))
 
                if (config.timerentry.type.value == 0): # once
                        pass
@@ -140,7 +140,7 @@ class TimerEntry(Screen):
                        if (config.timerentry.repeated.value == 1): # weekly
                                self.list.append(getConfigListEntry(_("Weekday"), config.timerentry.weekday))
 
-                       if (config.timerentry.repeated.value == 3): # user-defined
+                       if (config.timerentry.repeated.value == 3): # user defined
                                self.list.append(getConfigListEntry(_("Monday"), config.timerentry.day[0]))
                                self.list.append(getConfigListEntry(_("Tuesday"), config.timerentry.day[1]))
                                self.list.append(getConfigListEntry(_("Wednesday"), config.timerentry.day[2]))
@@ -170,7 +170,7 @@ class TimerEntry(Screen):
 
        def newConfig(self):
                print self["config"].getCurrent()
-               if self["config"].getCurrent()[0] == _("TimerType"):
+               if self["config"].getCurrent()[0] == _("Timer Type"):
                        self.createSetup()
                if self["config"].getCurrent()[0] == _("Frequency"):
                        self.createSetup()
@@ -242,7 +242,7 @@ class TimerEntry(Screen):
                                for x in range(0,5):
                                        self.timer.setRepeated(x)
                                
-                       if (config.timerentry.repeated.value == 3): # user-defined
+                       if (config.timerentry.repeated.value == 3): # user defined
                                for x in range(0,7):
                                        if (config.timerentry.day[x].value == 0): self.timer.setRepeated(x)
 
diff --git a/po/de.po b/po/de.po
index ad39aaabcfa0c3be84fdae4e6f026f1f2e04ad88..ccf46a8ec5896e57ee716a7c04011c5c64e7d31d 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -238,7 +238,7 @@ msgstr ""
 
 #: ../lib/python/Screens/NetworkSetup.py:41 ../data/
 msgid "IP Address"
-msgstr "IP Adresse"
+msgstr "IP-Adresse"
 
 #: ../lib/python/Screens/HarddiskSetup.py:31
 msgid "Initialize"
@@ -428,8 +428,8 @@ msgstr "Sonntag"
 
 #: ../lib/python/Screens/ScanSetup.py:89
 #: ../lib/python/Screens/ScanSetup.py:116
-msgid "Symbolrate"
-msgstr ""
+msgid "Symbol Rate"
+msgstr "Symbolrate"
 
 #: ../lib/python/Screens/Satconfig.py:55
 msgid "Terrestrial provider"
@@ -476,10 +476,10 @@ msgstr "USALS"
 #: ../lib/python/Screens/HarddiskSetup.py:47
 msgid ""
 "Unable to initialize harddisk.\n"
-"Please refer to the user-manual.\n"
+"Please refer to the user manual.\n"
 "Error: "
 msgstr ""
-"Konnte Festplatte nicht initialisieren..\n"
+"Konnte Festplatte nicht initialisieren.\n"
 "Bitte lesen Sie im Handbuch nach.\n"
 "Fehler: "
 
@@ -633,7 +633,7 @@ msgid "unknown service"
 msgstr "unbekannter Service"
 
 #: ../lib/python/Screens/TimerEntry.py:83
-msgid "user-defined"
+msgid "user defined"
 msgstr "benutzerdefiniert"
 
 #: ../lib/python/Screens/ScanSetup.py:172
@@ -719,7 +719,7 @@ msgstr "Grundeinstellungen jetzt vornehmen"
 msgid ""
 "Welcome.\n"
 "\n"
-"This start-wizard will guide you through the basic setup of your Dreambox.\n"
+"This start wizard will guide you through the basic setup of your Dreambox.\n"
 "Press the OK button on your remote control to move to the next step."
 msgstr ""
 "Willkommen.\n"
@@ -782,7 +782,7 @@ msgstr "Netzwerk"
 
 #: ../data/
 msgid "Invert"
-msgstr "Intervieren"
+msgstr "Invertieren"
 
 #: ../data/
 msgid "System"
@@ -838,7 +838,7 @@ msgstr "Schnelles Umschalten"
 
 #: ../data/
 msgid "OSD Settings"
-msgstr "OSD Einstellungen"
+msgstr "OSD-Einstellungen"
 
 #: ../data/
 msgid "Brightness"
@@ -849,7 +849,7 @@ msgid "Standby"
 msgstr ""
 
 #: ../data/
-msgid "Select-a-movie"
+msgid "Select a movie"
 msgstr ""
 
 #: ../data/
@@ -898,7 +898,7 @@ msgstr ""
 
 #: ../data/
 msgid "A/V Settings"
-msgstr "A/V Einstellungen"
+msgstr "A/V-Einstellungen"
 
 #: ../data/
 msgid "Service scan"
@@ -1005,7 +1005,7 @@ msgid "Please set up tuner B"
 msgstr "Einstellungen für Tuner B."
 
 #: ../data/
-msgid "Networksetup"
+msgid "Network setup"
 msgstr "Netzwerkeinstellungen"
 
 #: ../data/
@@ -1018,7 +1018,7 @@ msgstr "Festplattenwahl"
 
 #: ../data/
 msgid "Setup Lock"
-msgstr "Setup Sperre"
+msgstr "Setup-Sperre"
 
 #: ../data/
 msgid "Aspect Ratio"
@@ -1038,7 +1038,7 @@ msgid ""
 "\n"
 "Please set up tuner A"
 msgstr ""
-"Mit den recht-/links-Tasten können Sie Optionen ändern.\n"
+"Mit den rechts-/links-Tasten können Sie Optionen ändern.\n"
 "\n"
 "Einstellungen für Tuner A"
 
@@ -1083,11 +1083,11 @@ msgid "Video Audio"
 msgstr ""
 
 #: ../data/
-msgid "Testmode"
+msgid "Test mode"
 msgstr ""
 
 #: ../data/
-msgid "Tuner-Slot"
+msgid "Tuner Slot"
 msgstr ""
 
 #: ../data/
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources