changeset
merge of '0a3af8c9116edea3c951210e6639cac3e782b8e1'
Wed, 08 Jul 2009 00:50:29 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Wed, 08 Jul 2009 00:50:29 +0000
- changeset 27675
- 1c02a350fc07
- parent 27667
- 0a3af8c9116e (current diff)
- parent 27669
- 48863e05054b (diff)
- child 27676
- a1991c15288f
- child 27678
- 3bcf90eaeef5
merge of '0a3af8c9116edea3c951210e6639cac3e782b8e1'
and '48863e05054ba77a3fec90c999c6113c0cdb3170'
--- a/pidgin/gtkaccount.c Tue Jul 07 17:44:23 2009 +0000 +++ b/pidgin/gtkaccount.c Wed Jul 08 00:50:29 2009 +0000 @@ -784,7 +784,7 @@ dialog->protocol_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER); gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox, - gtk_label_new_with_mnemonic(_("_Advanced")), 1); + gtk_label_new_with_mnemonic(_("Ad_vanced")), 1); gtk_widget_show(vbox); for (l = dialog->prpl_info->protocol_options; l != NULL; l = l->next) @@ -1533,7 +1533,7 @@ dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER); gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, - gtk_label_new_with_mnemonic(_("_Proxy"))); + gtk_label_new_with_mnemonic(_("P_roxy"))); gtk_widget_show(dbox); add_proxy_options(dialog, dbox);
--- a/pidgin/gtkblist.c Tue Jul 07 17:44:23 2009 +0000 +++ b/pidgin/gtkblist.c Wed Jul 08 00:50:29 2009 +0000 @@ -6321,15 +6321,15 @@ mark = g_strdup_printf("<span foreground='%s' font_desc='%s'><b>%s</b>%s%s%s</span>", text_color, text_font, esc ? esc : "", - !expanded ? " <span font_weight='light'>(</span>" : "", + !expanded ? " <span weight='light'>(</span>" : "", group_count, - !expanded ? "<span font_weight='light'>)</span>" : ""); + !expanded ? "<span weight='light'>)</span>" : ""); } else { mark = g_strdup_printf("<span font_desc='%s'><b>%s</b>%s%s%s</span>", text_font, esc ? esc : "", - !expanded ? " <span font_weight='light'>(</span>" : "", + !expanded ? " <span weight='light'>(</span>" : "", group_count, - !expanded ? "<span font_weight='light'>)</span>" : ""); + !expanded ? "<span weight='light'>)</span>" : ""); } g_free(esc);
