pidgin/pidgin

Drop ampersands
release-2.x.y
2016-06-07, Richard Laager
03437cc299d4
Parents 5e5e84e8a798
Children 2d0793be3611
Drop ampersands

This changes "Save & Use" to "Save and Use". I believe the use of
ampersands is discouraged in formal writing. The OpenOffice HIG
agrees, for whatever that is worth.

Reported-by: Allan Nordhøy
2 files changed, 5 insertions(+), 5 deletions(-)
  • +2 -2
    finch/gntstatus.c
  • +3 -3
    pidgin/gtksavedstatuses.c
    • --- a/finch/gntstatus.c Sun May 15 05:41:39 2016 -0300
    +++ b/finch/gntstatus.c Tue Jun 07 00:35:17 2016 -0500
    @@ -602,8 +602,8 @@
    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);
    --- a/pidgin/gtksavedstatuses.c Sun May 15 05:41:39 2016 -0300
    +++ b/pidgin/gtksavedstatuses.c Tue Jun 07 00:35:17 2016 -0500
    @@ -805,7 +805,7 @@
    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 @@
    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);