# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1132360444 0
# Node ID d93e6979b77a282e320370303447cc1dbc7bf480
# Parent  cbebda5f019c918a57b403d53eb4c8a03869a351
[gaim-migrate @ 14445]
Fix a conflict in mnemonics I added. I'm going to force SimGuy to write a patch if I've done this wrong again.

committer: Tailor Script <tailor@pidgin.im>

diff -r cbebda5f019c -r d93e6979b77a src/gtkpounce.c
--- a/src/gtkpounce.c	Sat Nov 19 00:26:12 2005 +0000
+++ b/src/gtkpounce.c	Sat Nov 19 00:34:04 2005 +0000
@@ -555,7 +555,7 @@
 	dialog->away =
 		gtk_check_button_new_with_mnemonic(_("Goes a_way"));
 	dialog->away_return =
-		gtk_check_button_new_with_mnemonic(_("_Returns from away"));
+		gtk_check_button_new_with_mnemonic(_("Ret_urns from away"));
 	dialog->idle =
 		gtk_check_button_new_with_mnemonic(_("Becomes _Idle"));
 	dialog->idle_return =
@@ -612,9 +612,9 @@
 
 	dialog->send_msg_entry    = gtk_entry_new();
 	dialog->exec_cmd_entry    = gtk_entry_new();
-	dialog->exec_cmd_browse   = gtk_button_new_with_mnemonic(_("Br_owse..."));
+	dialog->exec_cmd_browse   = gtk_button_new_with_mnemonic(_("B_rowse..."));
 	dialog->play_sound_entry  = gtk_entry_new();
-	dialog->play_sound_browse = gtk_button_new_with_mnemonic(_("Brow_se..."));
+	dialog->play_sound_browse = gtk_button_new_with_mnemonic(_("Br_owse..."));
 	dialog->play_sound_test   = gtk_button_new_with_mnemonic(_("Pre_view"));
 
 	gtk_widget_set_sensitive(dialog->send_msg_entry,   FALSE);