# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1213198602 0
# Node ID adda955a8db6c7bc668d10e187abf0ec1f190f5f
# Parent  9cb1e75854f1a956544cd30d4a0930ed3957f319# Parent  fa904782a93486ad3908a1af7287748b58ed1cba
merge of '7be65dacd56b6536cf745747e39a29f4f7f2644b'
     and '83642da631db94ab79071de4a45576a91f7f0996'

diff -r 9cb1e75854f1 -r adda955a8db6 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Jun 11 02:42:23 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Jun 11 15:36:42 2008 +0000
@@ -131,8 +131,8 @@
 	N_("Busted SNAC payload"),
 	N_("Insufficient rights"),
 	N_("In local permit/deny"),
-	N_("Too evil (sender)"),
-	N_("Too evil (receiver)"),
+	N_("Warning level too high (sender)"),
+	N_("Warning level too high (receiver)"),
 	N_("User temporarily unavailable"),
 	N_("No match"),
 	N_("List overflow"),
@@ -2793,8 +2793,8 @@
 		case 3: /* Evil Sender */
 			buf = g_strdup_printf(
 				   dngettext(PACKAGE,
-				   "You missed %hu message from %s because he/she was too evil.",
-				   "You missed %hu messages from %s because he/she was too evil.",
+				   "You missed %hu message from %s because his/her warning level is too high.",
+				   "You missed %hu messages from %s because his/her warning level is too high.",
 				   nummissed),
 				   nummissed,
 				   userinfo->sn);
@@ -2802,8 +2802,8 @@
 		case 4: /* Evil Receiver */
 			buf = g_strdup_printf(
 				   dngettext(PACKAGE,
-				   "You missed %hu message from %s because you are too evil.",
-				   "You missed %hu messages from %s because you are too evil.",
+				   "You missed %hu message from %s because your warning level is too high.",
+				   "You missed %hu messages from %s because your warning level is too high.",
 				   nummissed),
 				   nummissed,
 				   userinfo->sn);