Mercurial > pidgin
changeset 17550:ef3f817cac91
merge of '73a92318a135ab11655ab5e68f5b079e16d72075'
and 'e8e7793a2f8c520976c6e1f1cffe1c30697f44bf'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 08 Jun 2007 12:52:35 +0000 |
| parents | 8132d615fae9 (diff) 13f7a06c240d (current diff) |
| children | f13334f5717e 2af1f8ccd396 c885a9ccd301 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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);