Mercurial > pidgin
changeset 22491:633eabc7eff4
merge of 'c2f80865e78beb384f2dec792cac08ac44cf4eea'
and 'ddb947301980e564af0ce937a3c94e5b6116304c'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 17 Mar 2008 01:56:29 +0000 |
| parents | f54a1f4f2963 (diff) 82c4e6b589d0 (current diff) |
| children | 0c2dd59f91d1 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Mon Mar 17 01:50:54 2008 +0000 +++ b/pidgin/gtkblist.c Mon Mar 17 01:56:29 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);