pidgin/pidgin

Merged in rlaager/pidgin/release-2.x.y (pull request #59)
release-2.x.y
2016-07-01, Gary Kramlich
8904ba5c1f69
Merged in rlaager/pidgin/release-2.x.y (pull request #59)

Use "Yahoo! ID" consistently
--- a/libpurple/protocols/yahoo/libyahoo.c Fri Jul 01 16:17:10 2016 -0500
+++ b/libpurple/protocols/yahoo/libyahoo.c Fri Jul 01 16:17:59 2016 -0500
@@ -163,7 +163,7 @@
{
GHashTable *table;
table = g_hash_table_new(g_str_hash, g_str_equal);
- g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo ID..."));
+ g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo! ID..."));
return table;
}