aboutsummaryrefslogtreecommitdiff
path: root/data/setup.xml
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-12-03 17:56:03 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-12-03 17:56:03 +0100
commit0cb206d2c07cb9e4130e13234e3fd59b127421a8 (patch)
tree07bcbcc638a6012d32b0574531cf0bd8304484ae /data/setup.xml
parent99a717e9813eab30cd34f5da6f4a5ab6e791dc1f (diff)
parente9272c492c7a3c7fd8a1225a4baa6bee2a02eea8 (diff)
downloadenigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.tar.gz
enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.zip
Merge branch 'master' into bug_245_record_playback_fixes
Diffstat (limited to 'data/setup.xml')
-rw-r--r--data/setup.xml5
1 files changed, 2 insertions, 3 deletions
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>