Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental

[enigma2.git] / data / setup.xml

diff --git a/data/setup.xml b/data/setup.xml
old mode 100644 (file)
new mode 100755 (executable)
index 894a2b8..c5eb07f
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -12,28 +12,52 @@
                        <item level="0" text="Aspect Ratio">config.av.aspectratio</item>
                        <item level="0" text="TV System">config.av.tvsystem</item>
                        <item level="1" text="WSS on 4:3">config.av.wss</item>
-                       <item level="0" text="AC3 default">config.av.defaultac3</item>
-                       <item level="0" text="VCR Switch">config.av.vcrswitch</item>
+                       <item level="1" text="AC3 default">config.av.defaultac3</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>
                <setup key="usage" title="Customize">
                        <item level="0" text="Setup Mode">config.usage.setup_level</item>
                        <item level="1" text="Recordings always have priority">config.recording.asktozap</item>
                        <item level="0" text="Margin before record (minutes)">config.recording.margin_before</item>
                        <item level="0" text="Margin after record">config.recording.margin_after</item>
+                       <item level="0" text="Show blinking clock in display during recording">config.usage.blinking_display_clock_during_recording</item>
+                       <item level="2" text="Show Message when Recording starts">config.usage.show_message_when_recording_starts</item>
+                       <item level="2" text="Load Length of Movies in Movielist">config.usage.load_length_of_movies_in_moviellist</item>
                        <item level="1" text="Show positioner movement">config.usage.showdish</item>
                        <item level="1" text="Enable multiple bouquets">config.usage.multibouquet</item>
                        <item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
                        <item level="1" text="Alternative radio mode">config.usage.e1like_radio_mode</item>
                        <item level="1" text="Action on long powerbutton press">config.usage.on_long_powerpress</item>
+                       <item level="1" text="Action on short powerbutton press">config.usage.on_short_powerpress</item>
                        <item level="0" text="Infobar timeout">config.usage.infobar_timeout</item>
-                       <item level="1" text="12V output">config.usage.output_12V</item>
+                       <item level="1" text="12V output" requires="12V_Output">config.usage.output_12V</item>
+                       <item level="0" text="Show event-progress in channel selection">config.usage.show_event_progress_in_servicelist</item>
                        <item level="2" text="Show infobar on channel change">config.usage.show_infobar_on_zap</item>
                        <item level="2" text="Show infobar on skip forward/backward">config.usage.show_infobar_on_skip</item>
                        <item level="2" text="Show infobar on event change">config.usage.show_infobar_on_event_change</item>
-                       <item level="2" text="Custom skip time for '1'/'3'-keys">config.usage.self_defined_seek</item>
-                       <item level="2" text="Behaviour of 0 key in PiP-mode">config.usage.pip_zero_button</item>
+                       <item level="2" text="Behavior when a movie is started">config.usage.on_movie_start</item>
+                       <item level="2" text="Behavior when a movie is stopped">config.usage.on_movie_stop</item>
+                       <item level="2" text="Behavior when a movie reaches the end">config.usage.on_movie_eof</item>
+                       <item level="2" text="Custom skip time for '1'/'3'-keys">config.seek.selfdefined_13</item>
+                       <item level="2" text="Custom skip time for '4'/'6'-keys">config.seek.selfdefined_46</item>
+                       <item level="2" text="Custom skip time for '7'/'9'-keys">config.seek.selfdefined_79</item>
+                       <item level="2" text="Fast Forward speeds">config.seek.speeds_forward</item>
+                       <item level="2" text="Rewind speeds">config.seek.speeds_backward</item>
+                       <item level="2" text="Slow Motion speeds">config.seek.speeds_slowmotion</item>
+<!-- TRANSLATORS: The following is the speed you get on the first press on fast-forward.
+     It was previously called "enter fast forward at speed" which was easily misunderstood. -->  
+                       <item level="2" text="Initial Fast Forward speed">config.seek.enter_forward</item>
+                       <item level="2" text="Initial Rewind speed">config.seek.enter_backward</item>
+                       <item level="2" text="Behavior of 'pause' when paused">config.seek.on_pause</item>
+                       <item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item>
+                       <item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item>
+                       <item level="2" text="Limited character set for recording filenames">config.recording.ascii_filenames</item>
+                       <item level="2" text="Composition of the recording filenames">config.recording.filename_composition</item>
                </setup>
-               <setup key="harddisk" title="Harddisk setup">
+               <setup key="harddisk" title="Harddisk setup" >
                        <item level="0" text="Harddisk standby after">config.usage.hdd_standby</item>
                </setup>
                <setup key="network" title="Network setup">
@@ -46,12 +70,12 @@
                        <item text="Activate network settings">config.network.activate</item>
                </setup>
                <setup key="RFmod" title="RF output">
-                       <item level="0" text="Modulator">config.rfmod.enable</item>
-                       <item level="1" text="Test mode">config.rfmod.test</item>
-                       <item level="1" text="Sound">config.rfmod.sound</item>
-                       <item level="1" text="Soundcarrier">config.rfmod.soundcarrier</item>
-                       <item level="0" text="Channel">config.rfmod.channel</item>
-                       <item level="0" text="Finetune">config.rfmod.finetune</item>
+                       <item level="1" text="Modulator">config.rfmod.enable</item>
+                       <item level="2" text="Test mode">config.rfmod.test</item>
+                       <item level="2" text="Sound">config.rfmod.sound</item>
+                       <item level="2" text="Soundcarrier">config.rfmod.soundcarrier</item>
+                       <item level="1" text="Channel">config.rfmod.channel</item>
+                       <item level="1" text="Finetune">config.rfmod.finetune</item>
                </setup>
                <setup key="keyboard" title="Keyboard Setup">
                        <item level="0" text="Keyboard Map">config.keyboard.keymap</item>
@@ -61,11 +85,10 @@
                        <item text="Brightness">config.osd.bright</item>
                        <item text="Contrast">config.osd.contrast</item>
                </setup>
-               <setup key="lcd" title="Display Setup">
+               <setup key="lcd" title="Display Setup" requires="FrontpanelDisplay">
                        <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="1" text="Invert display">config.lcd.invert</item>
                </setup>
                <setup key="satconfig" title="Sat / Dish Setup">
                        <item text="Tuner Slot">config.sat.tunerslot</item>