Mercurial > pidgin.yaz
changeset 23353:adda955a8db6
merge of '7be65dacd56b6536cf745747e39a29f4f7f2644b'
and '83642da631db94ab79071de4a45576a91f7f0996'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 11 Jun 2008 15:36:42 +0000 |
| parents | 9cb1e75854f1 (current diff) fa904782a934 (diff) |
| children | 6b09c40a15d1 77f43c248845 26eabe8e739b 2506d79768b8 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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);