Index: addressbook/gui/contact-editor/contact-editor.glade
===================================================================
--- addressbook/gui/contact-editor/contact-editor.glade	(revision 34619)
+++ addressbook/gui/contact-editor/contact-editor.glade	(working copy)
@@ -142,7 +142,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label-nickname">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Ni_ckname:</property>
+			  <property name="label" translatable="yes">Nic_kname:</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -253,7 +253,7 @@
 			<widget class="GtkButton" id="button-categories">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Categories...</property>
+			  <property name="label" translatable="yes">Ca_tegories...</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
Index: addressbook/ChangeLog
===================================================================
--- addressbook/ChangeLog	(revision 34619)
+++ addressbook/ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2007-12-02  David Turner  <cillian64@googlemail.com>
+
+	* gui/contact-editor/contact-editor.glade: Changed mnemonics on
+	"categories" and "nickname" to fix a clash
+
 2007-10-01  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #337539
