# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1250643814 0
# Node ID 0a587ffcab9bf91163d62d9d4e03e66aca78da72
# Parent  901476dc70b93a819a1ad8c4cc83d455b53043e9# Parent  7c6591eda2f9e71f34d685e178af782efe3b3dca
merge of '53b02d9c3c8aa71b13cea90eea22a0b60155dc8c'
     and 'a5f1e28f71900287ab051ba7d2ac8a6247311d13'

diff -r 901476dc70b9 -r 0a587ffcab9b libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Aug 19 00:37:01 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Aug 19 01:03:34 2009 +0000
@@ -6410,7 +6410,7 @@
 		{
 			if (conn)
 			{
-				act = purple_menu_action_new(_("Cancel Direct IM"),
+				act = purple_menu_action_new(_("End Direct IM Session"),
 				                          PURPLE_CALLBACK(oscar_close_directim),
 				                          NULL, NULL);
 			}