summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-15 23:56:28 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-15 23:56:28 -0500
commit8d7273e8a2b985bc46cd61369cd1c4fd2eb1318e (patch)
tree7e8cb2516ddecea07937fe6d832d6b01cecdcf0d
parent3346876b75033e8f99e27bc8cbfe55b1eadb4ab1 (diff)
downloadtde-systemsettings-8d7273e8.tar.gz
tde-systemsettings-8d7273e8.zip
Finish updates from GIT hash 3346876b.
-rw-r--r--systemsettings/menu/Makefile.am2
-rw-r--r--systemsettings/menu/system-settings.menu6
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>