# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1320024336 0
# Node ID 064eb5d78946a0508f7a28d88cba9e8b65544cba
# Parent  15e80ced77a2fedc6c8b90ede512d9c2233835c8# Parent  b6276b10cb10240e5c360e0a53b900f9f7db6a9f
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 0ba3afb8adb303a77581a7872d674c600979a5a6)
            to branch 'im.pidgin.pidgin' (head 7711a4d267e1fe776387496c764fb63227d70aec)

diff -r b6276b10cb10 -r 064eb5d78946 ChangeLog
--- 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)
 
diff -r b6276b10cb10 -r 064eb5d78946 pidgin/gtkmedia.c
--- 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);