X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/86518c1dd8f68926be67a2ddb2e171fc68b69c5b..aa414b363fd57de608f745266f3145e53bd775e8:/data/setup.xml

diff --git a/data/setup.xml b/data/setup.xml
index 51945cfa..08e4dcb7 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -11,23 +11,29 @@
 			<item text="Color Format">config.av.colorformat</item>
 			<item text="Aspect Ratio">config.av.aspectratio</item>
 			<item text="TV System">config.av.tvsystem</item>
-			<item text="WSS">config.av.wss</item>
+			<item text="WSS on 4:3">config.av.wss</item>
 			<item text="AC3 default">config.av.defaultac3</item>
 			<item text="VCR Switch">config.av.vcrswitch</item>
 		</setup>
-		<setup key="recording" title="Recording">
-			<item text="Ask before zapping">config.recording.asktozap</item>
+		<setup key="usage" title="Customize">
+			<item text="Recordings always have priority">config.recording.asktozap</item>
+			<item text="Margin before record (minutes)">config.recording.margin_before</item>
+			<item text="Margin after record">config.recording.margin_after</item>
+			<item text="Show positioner movement">config.usage.showdish</item>
+			<item text="Enable multiple bouquets">config.usage.multibouquet</item>
+			<item text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
+			<item text="Alternative radio mode">config.usage.e1like_radio_mode</item>
 		</setup>
 		<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>			
+			<item text="Netmask">config.network.netmask</item>
 			<item text="Gateway">config.network.gateway</item>
 			<item text="Nameserver">config.network.dns</item>
 <!--			<item text="MAC Address">config.network.mac</item>-->
 			<item text="Activate network settings">config.network.activate</item>
 		</setup>
-		<setup key="RFmod" title="UHF Modulator">
+		<setup key="RFmod" title="RF output">
 			<item text="Modulator">config.rfmod.enable</item>
 			<item text="Test mode">config.rfmod.test</item>
 			<item text="Sound">config.rfmod.sound</item>
@@ -42,25 +48,12 @@
 			<item text="Alpha">config.osd.alpha</item>
 			<item text="Brightness">config.osd.bright</item>
 			<item text="Contrast">config.osd.contrast</item>
-<!--			<item text="Language">config.osd.language</item>-->
 		</setup>
 		<setup key="lcd" title="LCD Setup">
 			<item text="Brightness">config.lcd.bright</item>
 			<item text="Contrast">config.lcd.contrast</item>
 			<item text="Standby">config.lcd.standby</item>
-			<item text="Invert">config.lcd.invert</item>
-		</setup>
-		<setup key="parental" title="Parental Control">
-			<item text="Parental Lock">config.parental.lock</item>
-			<item text="Setup Lock">config.parental.setuplock</item>
-		</setup>
-		<setup key="expert" title="Expert Setup">
-			<item text="Record Splitsize">config.expert.splitsize</item>
-			<item text="Show Satposition">config.expert.satpos</item>
-			<item text="Fast zapping">config.expert.fastzap</item>
-			<item text="Skip confirmations">config.expert.skipconfirm</item>
-			<item text="Hide error windows">config.expert.hideerrors</item>
-			<item text="Auto show inforbar">config.expert.autoinfo</item>
+			<item text="Invert display">config.lcd.invert</item>
 		</setup>
 		<setup key="satconfig" title="Sat / Dish Setup">
 			<item text="Tuner Slot">config.sat.tunerslot</item>
@@ -68,7 +61,7 @@
 			<item text="DiSEqC">config.sat.diseqc</item>
 			<item text="Longitude">config.sat.diseqca</item>
 			<item text="Latitude">config.sat.diseqcb</item>
-			<item text="use power delta" >config.sat.diseqcc</item>
+			<item text="Use power measurement" >config.sat.diseqcc</item>
 			<!--<item text="DiSEqC D">config.sat.diseqcd</item>-->
 		</setup>
 </setupxml>