[gnome-menus] layout: Drop settings.menu

[Vincent Untz <vuntz src gnome org>]

commit b68bcd27f44ce2c494f6e3cd9695890b9c02af04
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Feb 1 15:18:49 2011 +0100

    layout: Drop settings.menu
    
    It doesn't fit in the GNOME 3 world, where we use gnomecc.menu.

 .../InternetAndNetwork.directory.in                |    5 --
 desktop-directories/LookAndFeel.directory.in       |    5 --
 desktop-directories/Makefile.am                    |    5 --
 desktop-directories/Settings-System.directory.in   |    5 --
 desktop-directories/Settings.directory.in          |    5 --
 .../X-GNOME-Menu-System.directory.in               |    5 --
 layout/Makefile.am                                 |    3 +-
 layout/settings.menu                               |   57 --------------------
 po/POTFILES.in                                     |    6 --
 9 files changed, 1 insertions(+), 95 deletions(-)
---
diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
index a05eadc..1b60c06 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -3,8 +3,6 @@ directorydir = $(datadir)/desktop-directories
 # Should be moved to gnome-control-center:
 directory_in_controlcenterfiles =		\
 	Hardware.directory.in			\
-	InternetAndNetwork.directory.in		\
-	LookAndFeel.directory.in		\
 	Personal.directory.in			\
 	System.directory.in
 
@@ -16,14 +14,11 @@ directory_in_files =				\
 	Graphics.directory.in			\
 	Network.directory.in			\
 	Office.directory.in			\
-	Settings.directory.in			\
-	Settings-System.directory.in		\
 	System-Tools.directory.in		\
 	Utility.directory.in			\
 	Utility-Accessibility.directory.in	\
 	X-GNOME-Other.directory.in		\
 	X-GNOME-Menu-Applications.directory.in	\
-	X-GNOME-Menu-System.directory.in	\
 	$(directory_in_controlcenterfiles)
 
 directory_DATA = $(directory_in_files:.directory.in=.directory)
diff --git a/layout/Makefile.am b/layout/Makefile.am
index a59c314..43c8d87 100644
--- a/layout/Makefile.am
+++ b/layout/Makefile.am
@@ -1,8 +1,7 @@
 menudir = $(sysconfdir)/xdg/menus
 
 menu_DATA =			\
-	applications.menu	\
-	settings.menu
+	applications.menu
 
 EXTRA_DIST= $(menu_DATA)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d4366f6..6dfb62e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,20 +6,14 @@ desktop-directories/Education.directory.in
 desktop-directories/Game.directory.in
 desktop-directories/Graphics.directory.in
 desktop-directories/Hardware.directory.in
-desktop-directories/InternetAndNetwork.directory.in
-desktop-directories/LookAndFeel.directory.in
 desktop-directories/Network.directory.in
 desktop-directories/Office.directory.in
 desktop-directories/Personal.directory.in
-desktop-directories/Settings-System.directory.in
-desktop-directories/Settings.directory.in
 desktop-directories/System.directory.in
 desktop-directories/System-Tools.directory.in
 desktop-directories/Utility-Accessibility.directory.in
 desktop-directories/Utility.directory.in
 desktop-directories/X-GNOME-Menu-Applications.directory.in
-desktop-directories/X-GNOME-Menu-System.directory.in
-desktop-directories/X-GNOME-Other.directory.in
 simple-editor/gmenu-simple-editor.desktop.in
 [type: gettext/glade]simple-editor/gmenu-simple-editor.ui
 simple-editor/GMenuSimpleEditor/main.py