From cd18ba358c5c0de683533b2c7160646bfa66bfd1 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody@gnome.org>
Date: Tue, 1 Oct 2002 15:18:37 +0000
Subject: [PATCH] avoid conflicting mnemonics the menus no longer have images,
 silence the

2002-10-01  Jody Goldberg <jody@gnome.org>

	* gnome-ui-properties.glade : avoid conflicting mnemonics
	* gnome-ui-properties.c (set_have_icons) : the menus no  longer have
	  images, silence the warnings.
---
 NEWS                                             | 8 ++++++++
 capplets/ui-properties/ChangeLog                 | 6 ++++++
 capplets/ui-properties/gnome-ui-properties.c     | 2 --
 capplets/ui-properties/gnome-ui-properties.glade | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 739b2dc49..1005ca803 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+gnome-control-center 2.1.0.1
+
+Jody:
+	* Some minor ui tweaks for accessx.
+	* Some aix portabiltiy patches
+	* fix accelerators for ui-properties capplet.
+
+------------------------------------------------------------------------------
 gnome-control-center 2.0.1
 
 Chema:
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index cb7c6433f..c9fcb120c 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-01  Jody Goldberg <jody@gnome.org>
+
+	* gnome-ui-properties.glade : avoid conflicting mnemonics
+	* gnome-ui-properties.c (set_have_icons) : the menus no  longer have
+	  images, silence the warnings.
+
 2002-09-10  Jody Goldberg <jody@gnome.org>
 
 	http://bugzilla.gnome.org/show_bug.cgi?id=76419
diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c
index 3fd667884..10013c123 100644
--- a/capplets/ui-properties/gnome-ui-properties.c
+++ b/capplets/ui-properties/gnome-ui-properties.c
@@ -164,13 +164,11 @@ set_have_icons (GladeXML *dialog, gboolean value)
 {
   static char *menu_item_names[] = 
     {
-      "File Menu",
       "menu_item_1",
       "menu_item_2",
       "menu_item_3",
       "menu_item_4",
       "menu_item_5",
-      "edit1",
       "cut1",
       "copy1",
       "paste1",
diff --git a/capplets/ui-properties/gnome-ui-properties.glade b/capplets/ui-properties/gnome-ui-properties.glade
index ebed6892b..8e3dc07da 100644
--- a/capplets/ui-properties/gnome-ui-properties.glade
+++ b/capplets/ui-properties/gnome-ui-properties.glade
@@ -317,7 +317,7 @@
 		    <widget class="GtkCheckButton" id="menu_icons_toggle">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Show icons in menus</property>
+		      <property name="label" translatable="yes">Show _icons in menus</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="active">True</property>