Mercurial > pidgin.yaz
changeset 27494:d9ee3adfee58
merge of 'd4111c3c390e4fbea55bfa213f353d6012f249d5'
and 'e6faf7cfc687458f9e3d8f8a88c339de80843fc5'
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Wed, 08 Jul 2009 00:50:29 +0000 |
| parents | 531454a6026d (current diff) b2106bf5a6b4 (diff) |
| children | e420ce168630 6b11903c87c8 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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);