Mercurial > pidgin.yaz
changeset 32805:064eb5d78946
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 0ba3afb8adb303a77581a7872d674c600979a5a6)
to branch 'im.pidgin.pidgin' (head 7711a4d267e1fe776387496c764fb63227d70aec)
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 31 Oct 2011 01:25:36 +0000 |
| parents | 15e80ced77a2 (diff) b6276b10cb10 (current diff) |
| children | e323c2f84872 |
| files | ChangeLog gaim-uninstalled.pc.in gaim.pc.in libpurple/gaim-compat.h libpurple/protocols/silc10/Makefile.am libpurple/protocols/silc10/Makefile.mingw libpurple/protocols/silc10/README libpurple/protocols/silc10/TODO libpurple/protocols/silc10/buddy.c libpurple/protocols/silc10/chat.c libpurple/protocols/silc10/ft.c libpurple/protocols/silc10/ops.c libpurple/protocols/silc10/pk.c libpurple/protocols/silc10/silc.c libpurple/protocols/silc10/silcpurple.h libpurple/protocols/silc10/util.c libpurple/protocols/silc10/wb.c libpurple/protocols/silc10/wb.h libpurple/purple-2-uninstalled.pc.in libpurple/purple-2.pc.in libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in pidgin/gtkdocklet-gtk.c pidgin/gtkgaim-compat.h pidgin/pidgin-2-uninstalled.pc.in pidgin/pidgin-2.pc.in pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in |
| diffstat | 2 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 30 21:46:51 2011 +0000 +++ b/ChangeLog Mon Oct 31 01:25:36 2011 +0000 @@ -37,7 +37,10 @@ (#14529) * Support file transfers up to ~9 EiB. -version 2.10.1 (??/??/????): +version 2.10.1 (10/11/2011): + Finch: + * Fix compilation on OpenBSD. + Gadu-Gadu: * Fix problems linking against GnuTLS. (#14544)
--- a/pidgin/gtkmedia.c Sun Oct 30 21:46:51 2011 +0000 +++ b/pidgin/gtkmedia.c Mon Oct 31 01:25:36 2011 +0000 @@ -290,14 +290,14 @@ GtkWidget *menu; action_group = gtk_action_group_new("MediaActions"); +#ifdef ENABLE_NLS + gtk_action_group_set_translation_domain(action_group, + PACKAGE); +#endif gtk_action_group_add_actions(action_group, menu_entries, G_N_ELEMENTS(menu_entries), GTK_WINDOW(window)); -#ifdef ENABLE_NLS - gtk_action_group_set_translation_domain(action_group, - PACKAGE); -#endif window->priv->ui = gtk_ui_manager_new(); gtk_ui_manager_insert_action_group(window->priv->ui, action_group, 0); @@ -789,7 +789,7 @@ /* Hold button */ gtkmedia->priv->hold = - gtk_toggle_button_new_with_mnemonic("_Hold"); + gtk_toggle_button_new_with_mnemonic(_("_Hold")); gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->hold, FALSE, FALSE, 0); gtk_widget_show(gtkmedia->priv->hold); @@ -878,7 +878,7 @@ if (type & PURPLE_MEDIA_SEND_AUDIO) { gtkmedia->priv->mute = - gtk_toggle_button_new_with_mnemonic("_Mute"); + gtk_toggle_button_new_with_mnemonic(_("_Mute")); gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute, FALSE, FALSE, 0); gtk_widget_show(gtkmedia->priv->mute);