# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1181278236 0
# Node ID 8132d615fae9126f5b66f1b385e3c464028722fd
# Parent  84c7b697adcdd36bfe074373fdbe9fde7e72c590# Parent  42ba9c4c91720adc3f999502c93ae9096deead46
merge of '08772f5bb329fb5f8bbf0226a5d16f194c735506'
     and '24b458a698f7e1b9e8abc3d2f4571a5b1802ab26'

diff -r 42ba9c4c9172 -r 8132d615fae9 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Fri Jun 08 03:55:35 2007 +0000
+++ b/pidgin/gtkaccount.c	Fri Jun 08 04:50:36 2007 +0000
@@ -1024,7 +1024,7 @@
 	if (dialog->proxy_frame != NULL)
 		gtk_widget_destroy(dialog->proxy_frame);
 
-	frame = pidgin_make_frame(parent, _("Pro_xy Options"));
+	frame = pidgin_make_frame(parent, _("Proxy Options"));
 	dialog->proxy_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
 
 	gtk_box_reorder_child(GTK_BOX(parent), dialog->proxy_frame, 1);