/pidgin/main: 2d0793be3611: Merged in rlaager/pidgin/release-2.x...

[Gary Kramlich]

Changeset: 2d0793be3611dab19f9db7a0429954bc8c00b977
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-07-01 16:20 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/2d0793be3611

Description:

Merged in rlaager/pidgin/release-2.x.y (pull request #64)

Drop ampersands

diffstat:

 finch/gntstatus.c         |  4 ++--
 pidgin/gtksavedstatuses.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff --git a/finch/gntstatus.c b/finch/gntstatus.c
--- a/finch/gntstatus.c
+++ b/finch/gntstatus.c
@@ -602,8 +602,8 @@ void finch_savedstatus_edit(PurpleSavedS
 	g_object_set_data(G_OBJECT(button), "use", NULL);
 	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(save_savedstatus_cb), edit);
 
-	/* Save & Use */
-	button = gnt_button_new(_("Save & Use"));
+	/* Save and Use */
+	button = gnt_button_new(_("Save and Use"));
 	gnt_box_add_widget(GNT_BOX(box), button);
 	g_object_set_data(G_OBJECT(button), "use", GINT_TO_POINTER(TRUE));
 	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(save_savedstatus_cb), edit);
diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c
--- a/pidgin/gtksavedstatuses.c
+++ b/pidgin/gtksavedstatuses.c
@@ -805,7 +805,7 @@ status_editor_ok_cb(GtkButton *button, g
 	g_free(message);
 	g_free(unformatted);
 
-	/* If they clicked on "Save & Use" or "Use," then activate the status */
+	/* If they clicked on "Save and Use" or "Use," then activate the status */
 	if (button != dialog->save_button)
 		purple_savedstatus_activate(saved_status);
 
@@ -1215,8 +1215,8 @@ pidgin_status_editor_show(gboolean edit,
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(status_editor_ok_cb), dialog);
 
-	/* Save & Use button */
-	button = pidgin_pixbuf_button_from_stock(_("Sa_ve & Use"), GTK_STOCK_OK,
+	/* Save and Use button */
+	button = pidgin_pixbuf_button_from_stock(_("Sa_ve and Use"), GTK_STOCK_OK,
 										   PIDGIN_BUTTON_HORIZONTAL);
 	dialog->saveanduse_button = GTK_BUTTON(button);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);