Finish updates from GIT hash 3346876b.

systemsettings/menu/Makefile.am

@@ -1,5 +1,5 @@
 #temporary till KDE4 and it can be renamed
-xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop laptoppowermanagement.desktop medianotifications.desktop
+xdg_apps_DATA = audioencoding.desktop defaultapplication.desktop kcmfontinst.desktop kcm_knetworkconfmodule_ss.desktop laptop.desktop medianotifications.desktop
 
 xdg_menu_DATA = system-settings.menu
 

systemsettings/menu/system-settings.menu

@@ -1,6 +1,6 @@
  <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
   "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<!-- 
+<!--
 This menu layout aims to conform to the structure described here:
 
 https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
@@ -229,7 +229,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Filename>tde-displayconfig.desktop</Filename>
 				<Filename>tde-arts.desktop</Filename>
 				<Filename>tde-printers.desktop</Filename>
-<!--				<Filename>tde-laptoppowermanagement.desktop</Filename>-->
+<!--				<Filename>tde-laptop.desktop</Filename>-->
 	<!--			<Filename>tde-thinkpad.desktop</Filename>
 				<Filename>tde-kvaio.desktop</Filename>-->
 				<Filename>tde-userconfig.desktop</Filename>
@@ -240,7 +240,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 				<Filename>tde-displayconfig.desktop</Filename>
 				<Filename>tde-arts.desktop</Filename>
 				<Filename>tde-printers.desktop</Filename>
-<!--				<Filename>tde-laptoppowermanagement.desktop</Filename>-->
+<!--				<Filename>tde-laptop.desktop</Filename>-->
 	<!--			<Filename>tde-thinkpad.desktop</Filename>
 				<Filename>tde-kvaio.desktop</Filename>-->
 				<Filename>tde-userconfig.desktop</Filename>