X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/834926ea17f0489f857e6cfbd886171740928d6f..01abec53c6856c24666967ee51d25d09fc6b8863:/data/menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index ad73da7e..40916f93 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -17,6 +17,7 @@
 		<item text="Network setup">self.openSetup("network")</item>-->
 		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
 		<!--<item text="Radio"><code>print "radio mode"</code></item>-->
+		<item text="Media player"><screen module="MediaPlayer" screen="MediaPlayer" /></item>
 		<item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
 		<item text="VCR scart"><screen module="Scart" screen="Scart" /></item>
 
@@ -27,7 +28,7 @@
 		</menu>
 
 		<item text="Games / Plugins"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
-		<menu text="Setup">
+		<menu text="Setup" flushConfigOnClose="1" >
 			<id val="setup" />
 			<!--<menu text="Service Organising">
 				<item text="New Bouquets"></item>
@@ -36,7 +37,7 @@
 			</menu>-->
 			<menu text="Service Searching">
 				<id val="scan" />
-				<item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
+				<item text="Tuner configuration"><screen module="Satconfig" screen="NimSelection" /></item>
 				<item text="Automatic Scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
 				<!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
 				<item text="Manual Scan"><screen module="ScanSetup" /></item>
@@ -46,19 +47,21 @@
 			</menu>
 			<menu text="System">
 				<id val="system" />
-				<item text="Language"><screen module="LanguageSelection" /></item>
-				<item text="Usage"><setup id="usage" /></item>
-				<item text="Timezone"><setup id="timezone" /></item>
-				<item text="Video Audio"><setup id="avsetup" /></item>
-				<item text="UHF Modulator"><setup id="RFmod" /></item>
-				<item text="Harddisk"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
+				<item text="Language..."><screen module="LanguageSelection" /></item>
+				<item><setup id="usage" /></item>
+				<item><setup id="timezone" /></item>
+				<item><setup id="avsetup" /></item>
+				<item><setup id="RFmod" /></item>
+				<item text="Harddisk..."><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
 				<!--<item text="Remote Control"><setup id="rc" /></item>-->
 				<!--<item text="Keyboard"><setup id="keyboard" /></item>-->
 				<!--<item text="OSD"><setup id="osd" /></item>-->
-				<item text="LCD"><setup id="lcd" /></item>
-				<item text="Network"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
+				<item><setup id="lcd" /></item>
+				<item text="Network..."><screen module="NetworkSetup" screen="NetworkSetup" /></item>
+				<item text="Parental control..."><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
 			</menu>
 			<item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
+			<item text="Startwizard"><screen module="StartWizard" screen="StartWizard" /></item>
 			<!--<item text="Parental Control"><setup id="parental" /></item>-->
 			<!--<item text="Expert -disabled-"><setup id="expert" /></item>-->
 		</menu>