# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1181307155 0
# Node ID ef3f817cac9119df62ed52e093a2c25eb8268edb
# Parent  8132d615fae9126f5b66f1b385e3c464028722fd# Parent  13f7a06c240d03437bdcbe60b0f2dd907224a1b7
merge of '73a92318a135ab11655ab5e68f5b079e16d72075'
     and 'e8e7793a2f8c520976c6e1f1cffe1c30697f44bf'

diff -r 13f7a06c240d -r ef3f817cac91 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Fri Jun 08 12:38:30 2007 +0000
+++ b/pidgin/gtkaccount.c	Fri Jun 08 12:52:35 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);
diff -r 13f7a06c240d -r ef3f817cac91 pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c	Fri Jun 08 12:38:30 2007 +0000
+++ b/pidgin/gtkpounce.c	Fri Jun 08 12:52:35 2007 +0000
@@ -783,7 +783,7 @@
 	gtk_widget_show(table);
 
 	dialog->on_away =
-		gtk_check_button_new_with_mnemonic(_("P_ounce only when my status is not available"));
+		gtk_check_button_new_with_mnemonic(_("P_ounce only when my status is not Available"));
 	gtk_table_attach(GTK_TABLE(table), dialog->on_away, 0, 1, 0, 1,
 					 GTK_FILL, 0, 0, 0);