|
|
e4fba6 |
diff -up kdelibs-4.10.0/kded/applications.menu.Administration-menu kdelibs-4.10.0/kded/applications.menu
|
|
|
e4fba6 |
--- kdelibs-4.10.0/kded/applications.menu.Administration-menu 2013-01-23 15:44:19.000000000 -0600
|
|
|
e4fba6 |
+++ kdelibs-4.10.0/kded/applications.menu 2013-01-31 07:42:28.173553801 -0600
|
|
|
e4fba6 |
@@ -31,29 +31,31 @@
|
|
|
e4fba6 |
<Category>Core</Category>
|
|
|
e4fba6 |
<Not><Category>KDE</Category></Not>
|
|
|
e4fba6 |
</And>
|
|
|
e4fba6 |
+ <Category>X-Red-Hat-Base</Category>
|
|
|
e4fba6 |
|
|
|
e4fba6 |
<Category>X-SuSE-YaST</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-hardware</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-accessibility</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-components</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-desktop</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-looknfeel</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-network</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-webbrowsing</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-peripherals</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-hardware</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-power</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-security</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-sound</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-settings-system</Category>
|
|
|
e4fba6 |
- <Category>X-KDE-information</Category>
|
|
|
e4fba6 |
- <Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
|
|
|
e4fba6 |
- <Filename>kde-medianotifications.desktop</Filename>
|
|
|
e4fba6 |
- <Filename>kde-audioencoding.desktop</Filename>
|
|
|
e4fba6 |
</Not>
|
|
|
e4fba6 |
</Include>
|
|
|
e4fba6 |
</Menu>
|
|
|
e4fba6 |
<Menu>
|
|
|
e4fba6 |
+ <Name>System Settings</Name>
|
|
|
e4fba6 |
+ <Directory>SystemConfig.directory</Directory>
|
|
|
e4fba6 |
+ <Include>
|
|
|
e4fba6 |
+ <And>
|
|
|
e4fba6 |
+ <Category>System</Category>
|
|
|
e4fba6 |
+ <Category>Settings</Category>
|
|
|
e4fba6 |
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
|
e4fba6 |
+ </And>
|
|
|
e4fba6 |
+ </Include>
|
|
|
e4fba6 |
+ <Menu>
|
|
|
e4fba6 |
+ <Name>Server</Name>
|
|
|
e4fba6 |
+ <Directory>ServerConfig.directory</Directory>
|
|
|
e4fba6 |
+ <Include>
|
|
|
e4fba6 |
+ <Category>X-Red-Hat-ServerConfig</Category>
|
|
|
e4fba6 |
+ </Include>
|
|
|
e4fba6 |
+ </Menu>
|
|
|
e4fba6 |
+ </Menu>
|
|
|
e4fba6 |
+ <Menu>
|
|
|
e4fba6 |
<Name>Development</Name>
|
|
|
e4fba6 |
<Directory>kde-development.directory</Directory>
|
|
|
e4fba6 |
<Menu>
|
|
|
e4fba6 |
@@ -369,7 +371,11 @@
|
|
|
e4fba6 |
<Name>Settingsmenu</Name>
|
|
|
e4fba6 |
<Directory>kde-settingsmenu.directory</Directory>
|
|
|
e4fba6 |
<Include>
|
|
|
e4fba6 |
- <Category>Settings</Category>
|
|
|
e4fba6 |
+ <And>
|
|
|
e4fba6 |
+ <Category>Settings</Category>
|
|
|
e4fba6 |
+ <Not><Category>System</Category></Not>
|
|
|
e4fba6 |
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
|
e4fba6 |
+ </And>
|
|
|
e4fba6 |
</Include>
|
|
|
e4fba6 |
</Menu>
|
|
|
e4fba6 |
<Menu>
|
|
|
e4fba6 |
@@ -378,7 +384,9 @@
|
|
|
e4fba6 |
<Include>
|
|
|
e4fba6 |
<And>
|
|
|
e4fba6 |
<Category>System</Category>
|
|
|
e4fba6 |
+ <Not><Category>Settings</Category></Not>
|
|
|
e4fba6 |
<Not><Category>X-KDE-More</Category></Not>
|
|
|
e4fba6 |
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
|
e4fba6 |
</And>
|
|
|
e4fba6 |
</Include>
|
|
|
e4fba6 |
<Menu>
|