changeset
merge of 'e04778a3d29a5c87d9c696d2fd461ff9a57f621c'
Wed, 11 Jun 2008 15:36:42 +0000
- author
- Mark Doliner <markdoliner@pidgin.im>
- date
- Wed, 11 Jun 2008 15:36:42 +0000
- changeset 23494
- 7a29afecb9dc
- parent 23493
- e04778a3d29a (current diff)
- parent 23490
- f93483d76f84 (diff)
- child 23495
- cc9ee7e6a09f
- child 23496
- 4d2f8718a735
- child 23586
- e495a4623f76
merge of 'e04778a3d29a5c87d9c696d2fd461ff9a57f621c'
and 'f93483d76f841628ba342d81b06a27bb4ade6bdc'
--- 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);
