X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ac896c99e4cdcaf8090bdb2b76763d84c2d5191c..7466abeda3437afb71ce9ab8c0917cd8ea14482c:/data/setup.xml

diff --git a/data/setup.xml b/data/setup.xml
index 3b92ec61..f4fea25d 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -1,29 +1,40 @@
 <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="Usage settings">
+			<item text="Ask before zapping">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="Visualize positioner movement">config.usage.showdish</item>
+			<item text="Multi bouquets">config.usage.multibouquet</item>
+			<item text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</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="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="UHF Modulator">
 			<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>
@@ -36,7 +47,7 @@
 			<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>
+<!--			<item text="Language">config.osd.language</item>-->
 		</setup>
 		<setup key="lcd" title="LCD Setup">
 			<item text="Brightness">config.lcd.bright</item>
@@ -56,12 +67,13 @@
 			<item text="Hide error windows">config.expert.hideerrors</item>
 			<item text="Auto show inforbar">config.expert.autoinfo</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 delta" >config.sat.diseqcc</item>
+			<!--<item text="DiSEqC D">config.sat.diseqcd</item>-->
 		</setup>
-	</setupxml>
\ No newline at end of file
+</setupxml>