pidgin/pidgin

Merge in the oscar string updates
release-2.x.y
2016-06-19, Gary Kramlich
2c04b241e1c6
Merge in the oscar string updates
--- a/libpurple/protocols/oscar/oscar.c Sat Jun 18 23:40:50 2016 -0500
+++ b/libpurple/protocols/oscar/oscar.c Sun Jun 19 00:12:16 2016 -0500
@@ -5784,9 +5784,9 @@
NULL
};
static const gchar *aim_login_keys[] = {
- N_("Use clientLogin authentication"),
- N_("Use Kerberos-based authentication"),
- N_("Use MD5 based authentication"),
+ N_("clientLogin"),
+ N_("Kerberos"),
+ N_("MD5-based"),
NULL
};
static const gchar *aim_login_values[] = {
@@ -5796,8 +5796,8 @@
NULL
};
static const gchar *icq_login_keys[] = {
- N_("Use clientLogin authentication"),
- N_("Use MD5 based authentication"),
+ N_("clientLogin"),
+ N_("MD5-based"),
NULL
};
static const gchar *icq_login_values[] = {