kde4-settings/menu/master.menu: partly customized menu

kde4-settings/menu/master.menu

@@ -44,18 +44,18 @@
  </Move>
 
 	<Menu>
-		<Name>Edutainment</Name>
+		<Name>Education</Name>
 		<Menu>
 		    <Name>Development</Name>
 		    <Directory>kde-development.directory</Directory>
 		    <Include>
 			<Filename>gambas.desktop</Filename>
 			<Filename>lazarus.desktop</Filename>
-			<Filename>kde-kdevelop.desktop</Filename>
-			<Filename>kde-kturtle.desktop</Filename>
+			<Filename>fedora-eclipse.desktop</Filename>
+			<Filename>qdevelop.desktop</Filename>
+			<Filename>kde4-kturtle.desktop</Filename>
 			<Filename>kde-quanta.desktop</Filename>
 			<Filename>kde-umbrello.desktop</Filename>
-			<Filename>wxMaxima.desktop</Filename>
 		    </Include>
 		</Menu>
 		<Menu>
@@ -66,6 +66,14 @@
 			<Filename>alt-scilab.desktop</Filename>
 		    </Include>
 		</Menu>
+        	<Menu>
+		    <Name>Astronomy</Name>
+		    <Exclude>
+			<Filename>celestia.desktop</Filename>
+			<Filename>kde4-kstars.desktop</Filename>
+		    </Exclude>
+		</Menu>
+
 		<Menu>
 		    <Name>Miscellaneous</Name>
 		    <Exclude>
@@ -80,10 +88,11 @@
 	<Include>
 	    <Filename>blender.desktop</Filename>
 	    <Filename>dia.desktop</Filename>
-	    <Filename>kde-digikam.desktop</Filename>
+	    <Filename>kde4-digikam.desktop</Filename>
 	    <Filename>inkscape.desktop</Filename>
 	    <Filename>gimp.desktop</Filename>
 	    <Filename>xsane.desktop</Filename>
+	    <Filename>cuneiform-qt.desktop</Filename>
 	    <Filename>kde-kuickshow.desktop</Filename>
 	    <Filename>tuxpaint.desktop</Filename>
 	    <Filename>qcad.desktop</Filename>
@@ -93,12 +102,9 @@
 	<Name>Internet1</Name>
 	<Directory>kde-internet.directory</Directory>
 	<Include>
-	    <Filename>xchat.desktop</Filename>
-	    <Filename>psi.desktop</Filename>
 	    <Filename>firefox.desktop</Filename>
 	    <Filename>thunderbird.desktop</Filename>
-	    <Filename>kde-konqbrowser.desktop</Filename>
-	    <Filename>kde-kopete.desktop</Filename>
+	    <Filename>kde4-kopete.desktop</Filename>
 	</Include>
     </Menu>
     <Menu>
@@ -106,8 +112,8 @@
 	<Directory>kde-multimedia.directory</Directory>
 	<Include>
 	    <Filename>audacity.desktop</Filename>
-	    <Filename>kde-amarok.desktop</Filename>
-	    <Filename>kde-kaffeine.desktop</Filename>
+	    <Filename>kde4-amarok.desktop</Filename>
+	    <Filename>kde4-kaffeine.desktop</Filename>
 	    <Filename>Kino.desktop</Filename>
 	    <Filename>kde-kmix.desktop</Filename>
 	</Include>