diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
| commit | 0cb206d2c07cb9e4130e13234e3fd59b127421a8 (patch) | |
| tree | 07bcbcc638a6012d32b0574531cf0bd8304484ae /data | |
| parent | 99a717e9813eab30cd34f5da6f4a5ab6e791dc1f (diff) | |
| parent | e9272c492c7a3c7fd8a1225a4baa6bee2a02eea8 (diff) | |
| download | enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.tar.gz enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.zip | |
Merge branch 'master' into bug_245_record_playback_fixes
Diffstat (limited to 'data')
| -rw-r--r-- | data/encoding.conf | 1 | ||||
| -rw-r--r-- | data/setup.xml | 5 | ||||
| -rwxr-xr-x | data/skin_default.xml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/data/encoding.conf b/data/encoding.conf index 14eeaefd..9383317e 100644 --- a/data/encoding.conf +++ b/data/encoding.conf @@ -1,5 +1,6 @@ #Fallback encoding when in dvb-text no encoding table is given #Countycode ISO8859-X or ISO6397 +ara ISO8859-6 tur ISO8859-9 gre ISO8859-7 pol ISO8859-2 diff --git a/data/setup.xml b/data/setup.xml index fe91ba25..9425afda 100644 --- a/data/setup.xml +++ b/data/setup.xml @@ -13,8 +13,8 @@ <item level="0" text="TV System">config.av.tvsystem</item> <item level="1" text="WSS on 4:3">config.av.wss</item> <item level="1" text="AC3 default">config.av.defaultac3</item> - <item level="1" text="General AC3 delay">config.av.generalAC3delay</item> - <item level="1" text="General PCM delay">config.av.generalPCMdelay</item> + <item level="1" text="General AC3 delay (ms)">config.av.generalAC3delay</item> + <item level="1" text="General PCM delay (ms)">config.av.generalPCMdelay</item> <item level="1" text="AC3 downmix" requires="CanDownmixAC3">config.av.downmix_ac3</item> <item level="1" text="Auto scart switching" requires="ScartSwitch">config.av.vcrswitch</item> </setup> @@ -103,7 +103,6 @@ <item level="0" text="Brightness">config.lcd.bright</item> <item level="0" text="Contrast">config.lcd.contrast</item> <item level="0" text="Standby">config.lcd.standby</item> - <item level="2" text="Invert display">config.lcd.invert</item> </setup> <setup key="satconfig" title="Sat / Dish Setup"> <item text="Tuner Slot">config.sat.tunerslot</item> diff --git a/data/skin_default.xml b/data/skin_default.xml index 72dc3577..16504abf 100755 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -803,9 +803,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) <widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" /> </screen> <!-- Scan setup --> - <screen name="ScanSetup" position="center,center" size="520,390" title="Service scan"> + <screen name="ScanSetup" position="center,center" size="520,450" title="Service scan"> <widget name="config" position="10,10" size="500,350" scrollbarMode="showOnDemand" /> - <widget name="introduction" position="10,365" size="500,25" font="Regular;20" halign="center" /> + <widget name="introduction" position="10,365" size="500,75" font="Regular;20" halign="center" /> </screen> <!-- Scan simple --> <screen name="ScanSimple" position="center,center" size="420,350" title="Service scan"> |