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

diff --git a/data/setup.xml b/data/setup.xml
index 18222175..08e4dcb7 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -1,26 +1,41 @@
 <setupxml>
 		<setup key="rc" title="RC Menu">
-			<item text="Repeat Rate">config.inputDevices.repeat</item>
-			<item text="Delay Rate">config.inputDevices.delay</item>
+			<item text="Repeat">config.inputDevices.repeat</item>
+			<item text="Delay">config.inputDevices.delay</item>
 			<item text="Keymap">config.rc.map</item>
 		</setup>
-		<setup key="timezone" title="RC Menu">
+		<setup key="timezone" title="Timezone">
 			<item text="Timezone">config.timezone.val</item>
 		</setup>
 		<setup key="avsetup" title="A/V Settings">
 			<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="network" title="Networksetup">
+		<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="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="Testmode">config.rfmod.test</item>
+			<item text="Test mode">config.rfmod.test</item>
 			<item text="Sound">config.rfmod.sound</item>
 			<item text="Soundcarrier">config.rfmod.soundcarrier</item>
 			<item text="Channel">config.rfmod.channel</item>
@@ -33,32 +48,20 @@
 			<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-A Control">config.sat.diseqcA</item>
-			<item text="Tuner-A Position">config.sat.posA</item>
-			<item text="Tuner-A Sat">config.sat.satA</item>
-			<item text="Tuner-B Control">config.sat.diseqcB</item>
-			<item text="Tuner-A Position">config.sat.posB</item>
-			<item text="Tuner-B Sat">config.sat.satB</item>
+		<setup key="satconfig" title="Sat / Dish Setup">
+			<item text="Tuner Slot">config.sat.tunerslot</item>
+			<item text="Configuration Mode">config.sat.configmode</item>
+			<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 measurement" >config.sat.diseqcc</item>
+			<!--<item text="DiSEqC D">config.sat.diseqcd</item>-->
 		</setup>
-	</setupxml>
\ No newline at end of file
+</setupxml>