pidgin: c2f80865: I think "Yes" and "No" are better answer...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: c2f80865e78beb384f2dec792cac08ac44cf4eea
Ancestor: dbcb9257acca0e581313eebc2b8dc4f98bf66103
Author: nosnilmot at pidgin.im
Date: 2008-03-17T01:54:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c2f80865e78beb384f2dec792cac08ac44cf4eea

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	85d8f8fefcf4e6b9ac48e4c4b359e15506b1af09
+++ pidgin/gtkblist.c	0a8007e84a48093e19e8b2c164a4300d343fcfd8
@@ -549,7 +549,7 @@ gtk_blist_auto_personize(PurpleBlistNode
 		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);