applnk: menus/applications.menu - new desktop directory files - science mov...

baggins baggins at pld-linux.org
Sun May 16 22:37:54 CEST 2010


Author: baggins                      Date: Sun May 16 20:37:54 2010 GMT
Module: applnk                        Tag: HEAD
---- Log message:
- new desktop directory files
- science moved to root menu

---- Files affected:
applnk/menus:
   applications.menu (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: applnk/menus/applications.menu
diff -u applnk/menus/applications.menu:1.47 applnk/menus/applications.menu:1.48
--- applnk/menus/applications.menu:1.47	Thu May 13 15:26:50 2010
+++ applnk/menus/applications.menu	Sun May 16 22:37:49 2010
@@ -59,14 +59,14 @@
 		</Include>
 		<Menu>
 			<Name>IDE</Name>
-			<Directory>ide.directory</Directory>
+			<Directory>development-ide.directory</Directory>
 			<Include>
 				<Category>IDE</Category>
 			</Include>
 		</Menu>
 		<Menu>
 			<Name>Debugging</Name>
-			<Directory>debuger.directory</Directory>
+			<Directory>development-debugger.directory</Directory>
 			<Include>
 				<Or>
 				<Category>Debugger</Category>
@@ -76,21 +76,21 @@
 		</Menu>
 		<Menu>
 			<Name>Internationalisation</Name>
-			<Directory>i18n.directory</Directory>
+			<Directory>development-i18n.directory</Directory>
 			<Include>
 				<Category>Translation</Category>
 			</Include>
 		</Menu>
 		<Menu>
 			<Name>Web Design</Name>
-			<Directory>webdesign.directory</Directory>
+			<Directory>development-webdesign.directory</Directory>
 			<Include>
 				<Category>WebDevelopment</Category>
 			</Include>
 		</Menu>
 		<Menu>
 			<Name>Project Organisation</Name>
-			<Directory>project.directory</Directory>
+			<Directory>development-project.directory</Directory>
 			<Include>
 				<Category>RevisionControl</Category>
 				<Category>ProjectManagement</Category>		
@@ -99,23 +99,20 @@
 	</Menu>
 	<Menu>
 		<Name>Edutainment</Name>
-		<Directory>edutainment.directory</Directory>
+		<Directory>education.directory</Directory>
 		<Include>
 			<And>
 			<Category>Education</Category>
 			<Not><Category>Science</Category></Not>
 			</And>
 		</Include>
-		<Menu>
-			<Name>Science</Name>
-			<Directory>scientific.directory</Directory>
-			<Include>
-				<And>
-				<Category>Education</Category>
-				<Category>Science</Category>
-				</And>
-			</Include>				    
-		</Menu>
+	</Menu>
+	<Menu>
+		<Name>Science</Name>
+		<Directory>science.directory</Directory>
+		<Include>
+			<Category>Science</Category>
+		</Include>				    
 	</Menu>
 	<Menu>
 		<Name>Games</Name>
@@ -337,7 +334,7 @@
 		</Include>
 		<Menu>
 			<Name>CD-RW</Name>
-			<Directory>cd-rw.directory</Directory>
+			<Directory>multimedia-cd-rw.directory</Directory>
 			<Include>
 				<And>
 				<Or>
@@ -351,7 +348,7 @@
 		</Menu>
 		<Menu>
 			<Name>Editing</Name>
-			<Directory>media-edit.directory</Directory>
+			<Directory>multimedia-edit.directory</Directory>
 			<Include>
 				<And>
 				<Or>
@@ -368,7 +365,7 @@
 		</Menu>
 		<Menu>
 			<Name>Mixers</Name>
-			<Directory>media-mixers.directory</Directory>
+			<Directory>multimedia-mixers.directory</Directory>
 			<Include>
 				<And>
 				<Or>
@@ -382,7 +379,7 @@
 		</Menu>
 		<Menu>
 			<Name>Playing</Name>
-			<Directory>media-play.directory</Directory>
+			<Directory>multimedia-play.directory</Directory>
 			<Include>
 				<And>
 				<Or>
@@ -396,7 +393,7 @@
 		</Menu>
 		<Menu>
 			<Name>Tuning</Name>
-			<Directory>media-tuner.directory</Directory>
+			<Directory>multimedia-tuner.directory</Directory>
 			<Include>
 				<And>
 				<Or>
@@ -539,7 +536,7 @@
 		</Include>
 		<Menu>
 			<Name>Databases</Name>
-			<Directory>databases.directory</Directory>
+			<Directory>office-databases.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -549,7 +546,7 @@
 		</Menu>
 		<Menu>
 			<Name>Dictionary</Name>
-			<Directory>dicts.directory</Directory>
+			<Directory>office-dicts.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -559,7 +556,7 @@
 		</Menu>
 		<Menu>
 			<Name>PDA</Name>
-			<Directory>pda.directory</Directory>
+			<Directory>office-pda.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -569,7 +566,7 @@
 		</Menu>
 		<Menu>
 			<Name>PIMs</Name>
-			<Directory>pims.directory</Directory>
+			<Directory>office-pims.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -581,8 +578,8 @@
 			</Include>
 		</Menu>
 		<Menu>
-			<Name>Presentation</Name>
-			<Directory>presentations.directory</Directory>
+			<Name>Presentations</Name>
+			<Directory>office-presentations.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -592,7 +589,7 @@
 		</Menu>
 		<Menu>
 			<Name>Spreadsheets</Name>
-			<Directory>spreadsheets.directory</Directory>
+			<Directory>office-spreadsheets.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -602,7 +599,7 @@
 		</Menu>
 		<Menu>
 			<Name>Wordprocessors</Name>
-			<Directory>wordprocessors.directory</Directory>
+			<Directory>office-wordprocessors.directory</Directory>
 			<Include>
 				<And>
 				<Category>Office</Category>
@@ -628,8 +625,8 @@
 			</And>
 		</Include>
 		<Menu>
-			<Name>XFCE4</Name>
-			<Directory>xfce4-settings.directory</Directory>
+			<Name>XFCE</Name>
+			<Directory>settings-xfce.directory</Directory>
 			<Include>
 				<And>
 				<Category>Settings</Category>
@@ -645,7 +642,7 @@
 		</Menu>
 		<Menu>
 			<Name>GNOME</Name>
-			<Directory>gnome-settings.directory</Directory>
+			<Directory>settings-gnome.directory</Directory>
 			<Include>
 				<And>
 				<Category>Settings</Category>
@@ -656,7 +653,7 @@
 			</Include>
 			<Menu>
 				<Name>System</Name>
-				<Directory>gnome-settings-system.directory</Directory>
+				<Directory>settings-gnome-system.directory</Directory>
 				<Include>
 					<And>
 					<Category>Settings</Category>
@@ -667,7 +664,7 @@
 			</Menu>
 			<Menu>
 				<Name>Accessibility</Name>
-				<Directory>gnome-settings-accessibility.directory</Directory>
+				<Directory>settings-gnome-accessibility.directory</Directory>
 				<Include>
 					<And>
 					<Category>Settings</Category>
@@ -693,7 +690,7 @@
 		</Include>
 		<Menu>
 			<Name>Filesystem</Name>
-			<Directory>filesystem.directory</Directory>
+			<Directory>system-filesystem.directory</Directory>
 			<Include>
 				<And>
 				<Category>System</Category>
@@ -702,8 +699,8 @@
 			</Include>
 		</Menu>
 		<Menu>
-			<Name>Monitor</Name>
-			<Directory>monitor.directory</Directory>
+			<Name>Monitoring</Name>
+			<Directory>system-monitoring.directory</Directory>
 			<Include>
 				<And>
 				<Category>System</Category>
@@ -737,8 +734,8 @@
 		</Include>
 	</Menu>
 	<Menu>
-		<Name>Utilities</Name>
-		<Directory>utilities.directory</Directory>
+		<Name>Accessories</Name>
+		<Directory>accessories.directory</Directory>
 		<Include>
 			<And>
 			<Category>Utility</Category>
@@ -773,7 +770,7 @@
 		</Include>
 		<Menu>
 			<Name>Accessibility</Name>
-			<Directory>accessibility.directory</Directory>
+			<Directory>accessories-accessibility.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -783,7 +780,7 @@
 		</Menu>
 		<Menu>
 			<Name>Archiving</Name>
-			<Directory>archiving.directory</Directory>
+			<Directory>accessories-archiving.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -795,8 +792,8 @@
 			</Include>
 		</Menu>
 		<Menu>	
-			<Name>Calculator</Name>
-			<Directory>calculator.directory</Directory>
+			<Name>Calculators</Name>
+			<Directory>accessories-calculators.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -805,8 +802,8 @@
 			</Include>
 		</Menu>
 		<Menu>
-			<Name>Clock</Name>
-			<Directory>clock.directory</Directory>
+			<Name>Clocks</Name>
+			<Directory>accessories-clocks.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -816,7 +813,7 @@
 		</Menu>
 		<Menu>
 			<Name>Docklets</Name>
-			<Directory>docklets.directory</Directory>
+			<Directory>accessories-docklets.directory</Directory>
 			<Include>
 				<Or>
 				<Category>Applet</Category>
@@ -826,14 +823,14 @@
 		</Menu>
 		<Menu>
 			<Name>Editors</Name>
-			<Directory>editors.directory</Directory>
+			<Directory>accessories-editors.directory</Directory>
 			<Include>
 				<Category>TextEditor</Category>
 			</Include>
 		</Menu>
 		<Menu>
 			<Name>Electronics</Name>
-			<Directory>electronics.directory</Directory>
+			<Directory>accessories-electronics.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -843,7 +840,7 @@
 		</Menu>
 		<Menu>
 			<Name>Emulators</Name>
-			<Directory>emulators.directory</Directory>
+			<Directory>accessories-emulators.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -853,7 +850,7 @@
 		</Menu>
 		<Menu>
 			<Name>Engineering</Name>
-			<Directory>engineering.directory</Directory>
+			<Directory>accessories-engineering.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
@@ -863,7 +860,7 @@
 		</Menu>
 		<Menu>
 			<Name>FileManager</Name>
-			<Directory>filemanager.directory</Directory>
+			<Directory>accessories-filemanager.directory</Directory>
 			<Include>
 				<And>
 				<Category>Utility</Category>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/applnk/menus/applications.menu?r1=1.47&r2=1.48&f=u



More information about the pld-cvs-commit mailing list