Merge branch '219_negative_ac3_pcm_delay' into experimental

diff --combined data/setup.xml
index 22705f0bfa93ec67dffb3b78674fb6612301336b,0d59d8b7f0ca261d2b16ef8a7b9ef849bee11a83..9425afda93b0dfe1948a7f638bc6dd40058c1ea0
--- 1/data/setup.xml
--- 2/data/setup.xml
+++ b/data/setup.xml
@@@ -13,8 -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,6 -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>