/pidgin/main: 2c04b241e1c6: Merge in the oscar string updates

[Gary Kramlich]

Changeset: 2c04b241e1c6c84d50a39733bed32139b615101e
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-06-19 00:12 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/2c04b241e1c6

Description:

Merge in the oscar string updates

diffstat:

 libpurple/protocols/oscar/oscar.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (27 lines):

diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -5784,9 +5784,9 @@ void oscar_init(PurplePlugin *plugin, gb
 		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 @@ void oscar_init(PurplePlugin *plugin, gb
 		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[] = {