From: Dana Jansens <danakj@orodu.net>
Date: Fri, 1 Jun 2007 02:54:42 +0000 (+0000)
Subject: conflicting accels
X-Git-Tag: release-2.0.2~64
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8c454afe38ec5146b1332aafd3866c5024232aa0;p=dana%2Fobconf.git

conflicting accels
---

diff --git a/src/obconf.glade b/src/obconf.glade
index 29ac7a7..962e26d 100644
--- a/src/obconf.glade
+++ b/src/obconf.glade
@@ -499,7 +499,7 @@
 				    <widget class="GtkCheckButton" id="animate_iconify">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Animate _iconify and restore</property>
+				      <property name="label" translatable="yes">A_nimate iconify and restore</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
diff --git a/src/strings.c b/src/strings.c
index 43e71dd..674affe 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -13,7 +13,7 @@ gchar *s = N_("Theme");
 gchar *s = N_("<span weight=\"bold\">Windows</span>");
 gchar *s = N_("    ");
 gchar *s = N_("_Windows retain a border when undecorated");
-gchar *s = N_("Animate _iconify and restore");
+gchar *s = N_("A_nimate iconify and restore");
 gchar *s = N_("<span weight=\"bold\">Window Titles</span>");
 gchar *s = N_("    ");
 gchar *s = N_("_Button order:");