Additional XDG compliance fixes.

1 files changed, 151 insertions, 151 deletions

diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu
index a9b5a3b..26879df 100644
--- a/systemsettings/menu/system-settings.menu
+++ b/systemsettings/menu/system-settings.menu
@@ -18,7 +18,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 	<!-- General page -->
 	<Menu>
 		<Name>General</Name>
-		<Directory>kde-settings-general.directory</Directory>
+		<Directory>tde-settings-general.directory</Directory>
 
 		<Layout>
 			<Menuname>Personal</Menuname>
@@ -33,8 +33,8 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 		<!-- Personal -->
 		<Menu>
 			<Name>Personal</Name>
-			<Directory>kde-settings-personal.directory</Directory>
-		
+			<Directory>tde-settings-personal.directory</Directory>
+
 			<Layout>
 				<Menuname>User Account</Menuname>
 				<Menuname>Regional</Menuname>
@@ -49,15 +49,15 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- User Account -->
 			<Menu>
 				<Name>User Account</Name>
-				<Directory>kde-settings-useraccount.directory</Directory>
+				<Directory>tde-settings-useraccount.directory</Directory>
 				<Layout>
-					<Filename>kde-kcm_useraccount.desktop</Filename>
-					<Filename>kde-desktoppath.desktop</Filename>
+					<Filename>tde-kcm_useraccount.desktop</Filename>
+					<Filename>tde-desktoppath.desktop</Filename>
 					<Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-kcm_useraccount.desktop</Filename>
-					<Filename>kde-desktoppath.desktop</Filename>
+					<Filename>tde-kcm_useraccount.desktop</Filename>
+					<Filename>tde-desktoppath.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal-useraccount</Category>
 				</Include>
 			</Menu>
@@ -65,17 +65,17 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Regional -->
 			<Menu>
 				<Name>Regional</Name>
-				<Directory>kde-settings-regional.directory</Directory>
+				<Directory>tde-settings-regional.directory</Directory>
 				<Layout>
-					<Filename>kde-language.desktop</Filename>
-					<Filename>kde-spellchecking.desktop</Filename>
-					<Filename>kde-keyboard_layout.desktop</Filename>
+					<Filename>tde-language.desktop</Filename>
+					<Filename>tde-spellchecking.desktop</Filename>
+					<Filename>tde-keyboard_layout.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-language.desktop</Filename>
-					<Filename>kde-spellchecking.desktop</Filename>
-					<Filename>kde-keyboard_layout.desktop</Filename>
+					<Filename>tde-language.desktop</Filename>
+					<Filename>tde-spellchecking.desktop</Filename>
+					<Filename>tde-keyboard_layout.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal-regional</Category>
 				</Include>
 			</Menu>
@@ -83,15 +83,15 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Accessibility -->
 			<Menu>
 				<Name>Accessibility</Name>
-				<Directory>kde-settings-accessibility_ss.directory</Directory>
+				<Directory>tde-settings-accessibility_ss.directory</Directory>
 				<Layout>
-					<Filename>kde-kcmaccess.desktop</Filename>
-					<Filename>kde-khotkeys.desktop</Filename>
+					<Filename>tde-kcmaccess.desktop</Filename>
+					<Filename>tde-khotkeys.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-kcmaccess.desktop</Filename>
-					<Filename>kde-khotkeys.desktop</Filename>
+					<Filename>tde-kcmaccess.desktop</Filename>
+					<Filename>tde-khotkeys.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal-accessibility</Category>
 				</Include>
 			</Menu>
@@ -99,100 +99,100 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Default Applications -->
 			<Menu>
 				<Name>Default Applications</Name>
-				<Directory>kde-settings-defaultapplications.directory</Directory>
+				<Directory>tde-settings-defaultapplications.directory</Directory>
 				<Layout>
-					<Filename>kde-defaultapplication.desktop</Filename>
-					<Filename>kde-filetypes.desktop</Filename>
+					<Filename>tde-defaultapplication.desktop</Filename>
+					<Filename>tde-filetypes.desktop</Filename>
 					<Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-defaultapplication.desktop</Filename>
-					<Filename>kde-filetypes.desktop</Filename>
+					<Filename>tde-defaultapplication.desktop</Filename>
+					<Filename>tde-filetypes.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal</Category>
 				</Include>
 			</Menu>
 
 		</Menu>
 
-	
+
 		<!-- Look and Feel -->
 		<Menu>
 			<Name>Look and Feel</Name>
-			<Directory>kde-settings-looknfeel2.directory</Directory>
+			<Directory>tde-settings-looknfeel2.directory</Directory>
 			<Layout>
 				<Menuname>Appearance</Menuname>
 				<Menuname>Desktop</Menuname>
-				<Filename>kde-ksplashthememgr.desktop</Filename>
+				<Filename>tde-ksplashthememgr.desktop</Filename>
 				<Menuname>Window Behavior</Menuname>
 				<Menuname>Notifications</Menuname>
 				<Merge type="files" />
 			</Layout>
 			<Include>
-				<Filename>kde-ksplashthememgr.desktop</Filename>
+				<Filename>tde-ksplashthememgr.desktop</Filename>
 				<Category>X-TDE-systemsettings-lookandfeel</Category>
 			</Include>
-	
+
 			<!-- Appearance -->
 			<Menu>
 				<Name>Appearance</Name>
-				<Directory>kde-settings-appearance.directory</Directory>
+				<Directory>tde-settings-appearance.directory</Directory>
 				<Layout>
-					<Filename>kde-colors.desktop</Filename>
-					<Filename>kde-fonts.desktop</Filename>
+					<Filename>tde-colors.desktop</Filename>
+					<Filename>tde-fonts.desktop</Filename>
 					<Filename>kcmgtk-xdg.desktop</Filename>
-					<Filename>kde-kcmfontinst.desktop</Filename>
-					<Filename>kde-icons.desktop</Filename>
-					<Filename>kde-style.desktop</Filename>
-					<Filename>kde-twindecoration.desktop</Filename>
+					<Filename>tde-kcmfontinst.desktop</Filename>
+					<Filename>tde-icons.desktop</Filename>
+					<Filename>tde-style.desktop</Filename>
+					<Filename>tde-twindecoration.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-colors.desktop</Filename>
-					<Filename>kde-fonts.desktop</Filename>
+					<Filename>tde-colors.desktop</Filename>
+					<Filename>tde-fonts.desktop</Filename>
 					<Filename>kcmgtk-xdg.desktop</Filename>
-					<Filename>kde-kcmfontinst.desktop</Filename>
-					<Filename>kde-icons.desktop</Filename>
-					<Filename>kde-style.desktop</Filename>
-					<Filename>kde-twindecoration.desktop</Filename>
+					<Filename>tde-kcmfontinst.desktop</Filename>
+					<Filename>tde-icons.desktop</Filename>
+					<Filename>tde-style.desktop</Filename>
+					<Filename>tde-twindecoration.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-appearance</Category>
 				</Include>
 			</Menu>
-	
+
 			<!-- Desktop -->
 			<Menu>
 				<Name>Desktop</Name>
-				<Directory>kde-settings-desktop.directory</Directory>
-	
+				<Directory>tde-settings-desktop.directory</Directory>
+
 				<Layout>
-					<Filename>kde-background.desktop</Filename>
-					<Filename>kde-screensaver.desktop</Filename>
-					<Filename>kde-desktopbehavior.desktop</Filename>
-					<Filename>kde-desktop.desktop</Filename>
+					<Filename>tde-background.desktop</Filename>
+					<Filename>tde-screensaver.desktop</Filename>
+					<Filename>tde-desktopbehavior.desktop</Filename>
+					<Filename>tde-desktop.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
-	
+
 				<Include>
-					<Filename>kde-background.desktop</Filename>
-					<Filename>kde-screensaver.desktop</Filename>
-					<Filename>kde-desktopbehavior.desktop</Filename>
-					<Filename>kde-desktop.desktop</Filename>
+					<Filename>tde-background.desktop</Filename>
+					<Filename>tde-screensaver.desktop</Filename>
+					<Filename>tde-desktopbehavior.desktop</Filename>
+					<Filename>tde-desktop.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-desktop</Category>
 				</Include>
 			</Menu>
-	
+
 			<!-- Window Behavior -->
 			<Menu>
 				<Name>Window Behavior</Name>
-				<Directory>kde-settings-windowbehavior.directory</Directory>
-	
+				<Directory>tde-settings-windowbehavior.directory</Directory>
+
 				<Layout>
-					<Filename>kde-twinoptions.desktop</Filename>
-					<Filename>kde-twinrules.desktop</Filename>
+					<Filename>tde-twinoptions.desktop</Filename>
+					<Filename>tde-twinrules.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-twinoptions.desktop</Filename>
-					<Filename>kde-twinrules.desktop</Filename>
+					<Filename>tde-twinoptions.desktop</Filename>
+					<Filename>tde-twinrules.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-windowbehavior</Category>
 				</Include>
 			</Menu>
@@ -200,80 +200,80 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Notifications -->
 			<Menu>
 				<Name>Notifications</Name>
-				<Directory>kde-settings-notifications.directory</Directory>
-	
+				<Directory>tde-settings-notifications.directory</Directory>
+
 				<Layout>
-					<Filename>kde-kcmnotify.desktop</Filename>
-					<Filename>kde-bell.desktop</Filename>
-					<Filename>kde-medianotifications.desktop</Filename>
+					<Filename>tde-kcmnotify.desktop</Filename>
+					<Filename>tde-bell.desktop</Filename>
+					<Filename>tde-medianotifications.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-kcmnotify.desktop</Filename>
-					<Filename>kde-bell.desktop</Filename>
-					<Filename>kde-medianotifications.desktop</Filename>
+					<Filename>tde-kcmnotify.desktop</Filename>
+					<Filename>tde-bell.desktop</Filename>
+					<Filename>tde-medianotifications.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-notifications</Category>
 				</Include>
 			</Menu>
-	
+
 		</Menu>
-	
+
 		<!-- Computer Administration -->
 		<Menu>
 			<Name>Computer Administration</Name>
-			<Directory>kde-settings-computeradministration.directory</Directory>
-	
+			<Directory>tde-settings-computeradministration.directory</Directory>
+
 			<Layout>
-				<Filename>kde-clock.desktop</Filename>
+				<Filename>tde-clock.desktop</Filename>
 				<Menuname>Keyboard and Mouse</Menuname>
-				<Filename>kde-displayconfig.desktop</Filename>
-				<Filename>kde-arts.desktop</Filename>
-				<Filename>kde-printers.desktop</Filename>
-<!--				<Filename>kde-laptoppowermanagement.desktop</Filename>-->
-	<!--			<Filename>kde-thinkpad.desktop</Filename>
-				<Filename>kde-kvaio.desktop</Filename>-->
-				<Filename>kde-userconfig.desktop</Filename>
+				<Filename>tde-displayconfig.desktop</Filename>
+				<Filename>tde-arts.desktop</Filename>
+				<Filename>tde-printers.desktop</Filename>
+<!--				<Filename>tde-laptoppowermanagement.desktop</Filename>-->
+	<!--			<Filename>tde-thinkpad.desktop</Filename>
+				<Filename>tde-kvaio.desktop</Filename>-->
+				<Filename>tde-userconfig.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
 			<Include>
-				<Filename>kde-clock.desktop</Filename>
-				<Filename>kde-displayconfig.desktop</Filename>
-				<Filename>kde-arts.desktop</Filename>
-				<Filename>kde-printers.desktop</Filename>
-<!--				<Filename>kde-laptoppowermanagement.desktop</Filename>-->
-	<!--			<Filename>kde-thinkpad.desktop</Filename>
-				<Filename>kde-kvaio.desktop</Filename>-->
-				<Filename>kde-userconfig.desktop</Filename>
+				<Filename>tde-clock.desktop</Filename>
+				<Filename>tde-displayconfig.desktop</Filename>
+				<Filename>tde-arts.desktop</Filename>
+				<Filename>tde-printers.desktop</Filename>
+<!--				<Filename>tde-laptoppowermanagement.desktop</Filename>-->
+	<!--			<Filename>tde-thinkpad.desktop</Filename>
+				<Filename>tde-kvaio.desktop</Filename>-->
+				<Filename>tde-userconfig.desktop</Filename>
 				<Category>X-TDE-systemsettings-administration</Category>
 			</Include>
-	
+
 			<!-- Keyboard and Mouse -->
 			<Menu>
 				<Name>Keyboard and Mouse</Name>
-				<Directory>kde-settings-keyboardmouse.directory</Directory>
+				<Directory>tde-settings-keyboardmouse.directory</Directory>
 				<Layout>
-					<Filename>kde-keyboard.desktop</Filename>
-					<Filename>kde-keys.desktop</Filename>
-					<Filename>kde-mouse.desktop</Filename>
-					<Filename>kde-joystick.desktop</Filename>
+					<Filename>tde-keyboard.desktop</Filename>
+					<Filename>tde-keys.desktop</Filename>
+					<Filename>tde-mouse.desktop</Filename>
+					<Filename>tde-joystick.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-keyboard.desktop</Filename>
-					<Filename>kde-keys.desktop</Filename>
-					<Filename>kde-mouse.desktop</Filename>
-					<Filename>kde-joystick.desktop</Filename>
+					<Filename>tde-keyboard.desktop</Filename>
+					<Filename>tde-keys.desktop</Filename>
+					<Filename>tde-mouse.desktop</Filename>
+					<Filename>tde-joystick.desktop</Filename>
 					<Category>X-TDE-systemsettings-administration-keyboardmouse</Category>
 				</Include>
 			</Menu>
-	
+
 		</Menu>
-	
+
 		<!-- Network and Connectivity -->
 		<Menu>
 			<Name>Network and Connectivity</Name>
-			<Directory>kde-settings-networkconnectivity.directory</Directory>
-			
+			<Directory>tde-settings-networkconnectivity.directory</Directory>
+
 			<Layout>
 				<Menuname>Network Settings</Menuname>
 				<Menuname>Sharing</Menuname>
@@ -283,45 +283,45 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<Include>
 				<Category>X-TDE-systemsettings-network</Category>
 			</Include>
-	
+
 			<!-- Network Settings -->
 			<Menu>
 				<Name>Network Settings</Name>
-				<Directory>kde-settings-networksettings.directory</Directory>
-			
+				<Directory>tde-settings-networksettings.directory</Directory>
+
 				<Layout>
-					<Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
-					<Filename>kde-proxy.desktop</Filename>
-					<Filename>kde-netpref.desktop</Filename>
-					<Filename>kde-kcm_kdnssd.desktop</Filename>
+					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
+					<Filename>tde-proxy.desktop</Filename>
+					<Filename>tde-netpref.desktop</Filename>
+					<Filename>tde-kcm_kdnssd.desktop</Filename>
                                         <Merge type="files" />
-				</Layout>		
-	
+				</Layout>
+
 				<Include>
-					<Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
-					<Filename>kde-proxy.desktop</Filename>
-					<Filename>kde-netpref.desktop</Filename>
-					<Filename>kde-kcm_kdnssd.desktop</Filename>
+					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
+					<Filename>tde-proxy.desktop</Filename>
+					<Filename>tde-netpref.desktop</Filename>
+					<Filename>tde-kcm_kdnssd.desktop</Filename>
 					<Category>X-TDE-systemsettings-network-networksettings</Category>
 				</Include>
 			</Menu>
-	
+
 			<!-- Sharing -->
 			<Menu>
 				<Name>Sharing</Name>
-				<Directory>kde-settings-sharing.directory</Directory>
-	
+				<Directory>tde-settings-sharing.directory</Directory>
+
 				<Layout>
-					<Filename>kde-kcmkrfb.desktop</Filename>
-					<Filename>kde-fileshare.desktop</Filename>
-					<Filename>kde-lanbrowser.desktop</Filename>
+					<Filename>tde-kcmkrfb.desktop</Filename>
+					<Filename>tde-fileshare.desktop</Filename>
+					<Filename>tde-lanbrowser.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
-				
+
 				<Include>
-					<Filename>kde-kcmkrfb.desktop</Filename>
-					<Filename>kde-fileshare.desktop</Filename>
-					<Filename>kde-lanbrowser.desktop</Filename>
+					<Filename>tde-kcmkrfb.desktop</Filename>
+					<Filename>tde-fileshare.desktop</Filename>
+					<Filename>tde-lanbrowser.desktop</Filename>
 					<Category>X-TDE-systemsettings-network-sharing</Category>
 				</Include>
 			</Menu>
@@ -329,10 +329,10 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 	</Menu>
 
 	<!-- Advanced -->
-	<Menu>	
+	<Menu>
 		<Name>Advanced</Name>
 
-		<Directory>kde-settings-advanced.directory</Directory>
+		<Directory>tde-settings-advanced.directory</Directory>
 		<Layout>
 			<Menuname>System</Menuname>
 			<Separator/>
@@ -342,44 +342,44 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 		<!-- System Administration -->
 		<Menu>
 			<Name>System</Name>
-			<Directory>kde-settings-system.directory</Directory>
-	
+			<Directory>tde-settings-system.directory</Directory>
+
 			<Layout>
-				<Filename>kde-mountconfig.desktop</Filename>
-				<Filename>kde-serviceconfig.desktop</Filename>
-				<Filename>kde-tdm.desktop</Filename>
+				<Filename>tde-mountconfig.desktop</Filename>
+				<Filename>tde-serviceconfig.desktop</Filename>
+				<Filename>tde-tdm.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
-	
+
 			<Include>
-				<Filename>kde-mountconfig.desktop</Filename>
-				<Filename>kde-serviceconfig.desktop</Filename>
-				<Filename>kde-tdm.desktop</Filename>
+				<Filename>tde-mountconfig.desktop</Filename>
+				<Filename>tde-serviceconfig.desktop</Filename>
+				<Filename>tde-tdm.desktop</Filename>
 				<Category>X-TDE-systemsettings-advancedadministration</Category>
 			</Include>
 		</Menu>
-	
+
 		<!-- Advanced User Settings -->
 		<Menu>
 			<Name>Advanced User Settings</Name>
-			<Directory>kde-settings-advancedusersettings.directory</Directory>
-	
+			<Directory>tde-settings-advancedusersettings.directory</Directory>
+
 			<Layout>
-				<Filename>kde-audioencoding.desktop</Filename>
-				<Filename>kde-kresources.desktop</Filename>
-				<Filename>kde-kcmkded.desktop</Filename>
-				<Filename>kde-kcmsmserver.desktop</Filename>
+				<Filename>tde-audioencoding.desktop</Filename>
+				<Filename>tde-kresources.desktop</Filename>
+				<Filename>tde-kcmkded.desktop</Filename>
+				<Filename>tde-kcmsmserver.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
-	
+
 			<Include>
-				<Filename>kde-audioencoding.desktop</Filename>
-				<Filename>kde-kresources.desktop</Filename>
-				<Filename>kde-kcmkded.desktop</Filename>
-				<Filename>kde-kcmsmserver.desktop</Filename>
+				<Filename>tde-audioencoding.desktop</Filename>
+				<Filename>tde-kresources.desktop</Filename>
+				<Filename>tde-kcmkded.desktop</Filename>
+				<Filename>tde-kcmsmserver.desktop</Filename>
 				<Category>X-TDE-systemsettings-advancedusersettings</Category>
 			</Include>
 		</Menu>
-	</Menu>	
+	</Menu>
 </Menu>