# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1133718457 0
# Node ID e346a085bb4f21ec40edc5593e03d0fcd10ddc73
# Parent  1baf4cbcf84d51d70b034f06c8e79e46d4418ae0
[gaim-migrate @ 14622]
Try to remove the word contact from the UI as much as possible.

committer: Tailor Script <tailor@pidgin.im>

diff -r 1baf4cbcf84d -r e346a085bb4f src/protocols/msn/error.c
--- a/src/protocols/msn/error.c	Sun Dec 04 17:47:05 2005 +0000
+++ b/src/protocols/msn/error.c	Sun Dec 04 17:47:37 2005 +0000
@@ -92,7 +92,7 @@
 			break;
 		case 231:
 			g_snprintf(msg, sizeof(msg),
-					   _("Tried to add a contact to a group "
+					   _("Tried to add a user to a group "
 						 "that doesn't exist"));
 			break;
 		case 280:
diff -r 1baf4cbcf84d -r e346a085bb4f src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Sun Dec 04 17:47:05 2005 +0000
+++ b/src/protocols/msn/msn.c	Sun Dec 04 17:47:37 2005 +0000
@@ -1970,7 +1970,7 @@
 	gaim_cmd_register("nudge", "", GAIM_CMD_P_PRPL,
 	                  GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY,
 	                 "prpl-msn", msn_cmd_nudge,
-	                  _("nudge: nudge a contact to get their attention"), NULL);
+	                  _("nudge: nudge a user to get their attention"), NULL);
 
 	gaim_prefs_remove("/plugins/prpl/msn");
 }
diff -r 1baf4cbcf84d -r e346a085bb4f src/protocols/msn/userlist.c
--- a/src/protocols/msn/userlist.c	Sun Dec 04 17:47:05 2005 +0000
+++ b/src/protocols/msn/userlist.c	Sun Dec 04 17:47:37 2005 +0000
@@ -262,7 +262,7 @@
 		gc = gaim_account_get_connection(account);
 
 		gaim_debug_info("msn",
-						"%s has added you to his or her contact list.\n",
+						"%s has added you to his or her buddy list.\n",
 						passport);
 
  		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, passport, account);
@@ -272,7 +272,7 @@
  
  			buddy = gaim_find_buddy(account, passport);
  			msg = g_strdup_printf(
- 				_("%s has added you to his or her contact list."),
+ 				_("%s has added you to his or her buddy list."),
  				buddy ? gaim_buddy_get_contact_alias(buddy) : passport);
  			gaim_conv_im_write(GAIM_CONV_IM(convo), passport, msg,
  				GAIM_MESSAGE_SYSTEM, time(NULL));
@@ -326,7 +326,7 @@
 		GaimConversation *convo;
 
 		gaim_debug_info("msn",
-						"%s has removed you from his or her contact list.\n",
+						"%s has removed you from his or her buddy list.\n",
 						passport);
 
 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, passport, account);
@@ -336,7 +336,7 @@
 
 			buddy = gaim_find_buddy(account, passport);
 			msg = g_strdup_printf(
-				_("%s has removed you from his or her contact list."),
+				_("%s has removed you from his or her buddy list."),
 				buddy ? gaim_buddy_get_contact_alias(buddy) : passport);
 			gaim_conv_im_write(GAIM_CONV_IM(convo), passport, msg,
 				GAIM_MESSAGE_SYSTEM, time(NULL));
@@ -412,7 +412,7 @@
 
 	if (list_op & MSN_LIST_RL_OP)
 	{
-		/* These are users who have us on their contact list. */
+		/* These are users who have us on their buddy list. */
 		/* TODO: what does store name is when this happens? */
 
 		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
diff -r 1baf4cbcf84d -r e346a085bb4f src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Sun Dec 04 17:47:05 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sun Dec 04 17:47:37 2005 +0000
@@ -3525,7 +3525,7 @@
 	gaim_cmd_register("buzz", "", GAIM_CMD_P_PRPL,
 	                  GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY,
 	                  "prpl-yahoo", yahoogaim_cmd_buzz,
-	                  _("buzz: Buzz a contact to get their attention"), NULL);
+	                  _("buzz: Buzz a user to get their attention"), NULL);
 
 	gaim_cmd_register("doodle", "", GAIM_CMD_P_PRPL,
 			  GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY,