Mercurial > pidgin
changeset 27924:ce50e961f650
merge of '319edba55f1c66810f6a7a2af17e808a5bc75e3e'
and '6ffba0724b246f1a87f83b1b19299aefcdd48142'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 16 Aug 2009 05:23:07 +0000 |
parents | df920ad8cf4f (current diff) 6d3f3473cb4c (diff) |
children | 957b26cadd97 650b79eaf305 |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libyahoo.c Sun Aug 16 03:27:56 2009 +0000 +++ b/libpurple/protocols/yahoo/libyahoo.c Sun Aug 16 05:23:07 2009 +0000 @@ -278,7 +278,7 @@ NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ "prpl-yahoo", /**< id */ - "Yahoo!", /**< name */ + "Yahoo", /**< name */ DISPLAY_VERSION, /**< version */ /** summary */ N_("Yahoo! Protocol Plugin"),
--- a/libpurple/protocols/yahoo/libyahoojp.c Sun Aug 16 03:27:56 2009 +0000 +++ b/libpurple/protocols/yahoo/libyahoojp.c Sun Aug 16 05:23:07 2009 +0000 @@ -174,7 +174,7 @@ NULL, /**< dependencies */ PURPLE_PRIORITY_DEFAULT, /**< priority */ "prpl-yahoojp", /**< id */ - "Yahoo! JAPAN", /**< name */ + "Yahoo JAPAN", /**< name */ DISPLAY_VERSION, /**< version */ /** summary */ N_("Yahoo! JAPAN Protocol Plugin"),