Mercurial > pidgin.yaz
changeset 22479:f54a1f4f2963
I think "Yes" and "No" are better answers to "Would you like to merge these
buddies?" than "Merge" and "Cancel". Cancel is far too negative and made me
think it was going to cancel adding the buddy I just added.
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 17 Mar 2008 01:54:00 +0000 |
| parents | b5af505a7b02 |
| children | 633eabc7eff4 |
| files | pidgin/gtkblist.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sun Mar 16 20:37:49 2008 +0000 +++ b/pidgin/gtkblist.c Mon Mar 17 01:54:00 2008 +0000 @@ -549,7 +549,7 @@ char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. " "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL, - merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free)); + merges, 2, _("_Yes"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_No"), PURPLE_CALLBACK(g_list_free)); g_free(msg); } else g_list_free(merges);