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

conflicting accels
---

diff --git a/src/obconf.glade b/src/obconf.glade
index 05434fb..994893d 100644
--- a/src/obconf.glade
+++ b/src/obconf.glade
@@ -1359,7 +1359,7 @@ C - The close button</property>
 			    <widget class="GtkCheckButton" id="resize_contents">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Update the window _contents while resizing</property>
+			      <property name="label" translatable="yes">Update the window contents while _resizing</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 4ba2315..5f23f08 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -40,7 +40,7 @@ gchar *s = N_("    ");
 gchar *s = N_("_Place new windows under the mouse pointer");
 gchar *s = N_("<span weight=\"bold\">Moving and Resizing Windows</span>");
 gchar *s = N_("    ");
-gchar *s = N_("Update the window _contents while resizing");
+gchar *s = N_("Update the window contents while _resizing");
 gchar *s = N_("_Show size dialog:");
 gchar *s = N_("When resizing terminal windows");
 gchar *s = N_("Always");