From 8d7273e8a2b985bc46cd61369cd1c4fd2eb1318e Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Fri, 15 Jun 2012 23:56:28 -0500
Subject: Finish updates from GIT hash 3346876b.

---
 systemsettings/menu/Makefile.am          | 2 +-
 systemsettings/menu/system-settings.menu | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/systemsettings/menu/Makefile.am b/systemsettings/menu/Makefile.am
index 30ffdf8..f777e39 100644
--- a/systemsettings/menu/Makefile.am
+++ b/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
 
diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu
index 26879df..16f55b2 100644
--- a/systemsettings/menu/system-settings.menu
+++ b/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>
-- 
cgit v1.2.1