pidgin: 428b2c1d: Fix some English in the QQ plugin. And r...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 428b2c1d4a5299aeb7e14d0b1b12a0a162873cdb
Ancestor: 2d203a89c855916b5c37a95cc1869c15b24f812c
Author: qulogic at pidgin.im
Date: 2008-12-11T04:03:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/428b2c1d4a5299aeb7e14d0b1b12a0a162873cdb

Modified files:
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c

ChangeLog: 

Fix some English in the QQ plugin. And remove some translated phrases that are
in purple_debug_* calls.

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/group_join.c	aaabb2d2ecd17977b4a54243a22e8f10e3d7ec20
+++ libpurple/protocols/qq/group_join.c	48e2e185e1764e481acc2fbafe48a37d04f90ce8
@@ -219,11 +219,11 @@ void qq_process_group_cmd_join_group_aut
 
 	rmd = qq_room_data_find(gc, id);
 	if (rmd != NULL) {
-		msg = g_strdup_printf(_("Successed join to Qun %s (%u)"), rmd->title_utf8, rmd->ext_id);
+		msg = g_strdup_printf(_("Succeeded joining Qun %s (%u)"), rmd->title_utf8, rmd->ext_id);
 		qq_got_message(gc, msg);
 		g_free(msg);
 	} else {
-		qq_got_message(gc, _("Successed join to Qun"));
+		qq_got_message(gc, _("Succeeded joining Qun"));
 	}
 }
 
@@ -254,7 +254,7 @@ void qq_process_group_cmd_join_group(gui
 	g_return_if_fail(rmd != NULL);
 	switch (reply) {
 	case QQ_ROOM_JOIN_OK:
-		purple_debug_info("QQ", "Successed in joining group \"%s\"\n", rmd->title_utf8);
+		purple_debug_info("QQ", "Succeeded in joining group \"%s\"\n", rmd->title_utf8);
 		rmd->my_role = QQ_ROOM_ROLE_YES;
 		/* this must be shown before getting online members */
 		qq_room_conv_open(gc, rmd);
@@ -267,7 +267,7 @@ void qq_process_group_cmd_join_group(gui
 		do_room_join_request(gc, rmd);
 		break;
 	case QQ_ROOM_JOIN_DENIED:
-		msg = g_strdup_printf(_("Qun %u denied to join"), rmd->ext_id);
+		msg = g_strdup_printf(_("Qun %u denied from joining"), rmd->ext_id);
 		purple_notify_info(gc, _("QQ Qun Operation"), _("Failed:"), msg);
 		g_free(msg);
 		break;
============================================================
--- libpurple/protocols/qq/qq_base.c	31cdf254207298dc55895d2db265ad7451078c10
+++ libpurple/protocols/qq/qq_base.c	f6d9f7cec2000687f44fdd7c88ec2874106dafa3
@@ -72,7 +72,7 @@ static gint8 process_login_ok(PurpleConn
 		qq_show_packet("Login reply OK, but length < 139", data, len);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-				_("Can not decrypt server reply"));
+				_("Cannot decrypt server reply"));
 		return QQ_LOGIN_REPLY_ERR;
 	}
 
@@ -160,7 +160,7 @@ static gint8 process_login_redirect(Purp
 	if (len < 11) {
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-				_("Can not decrypt get server reply"));
+				_("Cannot decrypt server reply"));
 		return QQ_LOGIN_REPLY_ERR;
 	}
 
============================================================
--- libpurple/protocols/qq/qq_network.c	57537b7524c49a259f83ede1465536ffc8b5bf08
+++ libpurple/protocols/qq/qq_network.c	6ef7bc80d675ecf13d5b89c1ec4034f14cb0bd58
@@ -376,7 +376,7 @@ static void tcp_pending(gpointer data, g
 			/* No worries */
 			return;
 
-		error_msg = g_strdup_printf(_("Lost connection with server:\n%d, %s"), errno, g_strerror(errno));
+		error_msg = g_strdup_printf(_("Lost connection with server: %d, %s"), errno, g_strerror(errno));
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				error_msg);
@@ -935,7 +935,7 @@ gboolean connect_to_server(PurpleConnect
 		return FALSE;
 	}
 
-	purple_connection_update_progress(gc, _("Connecting server ..."), 1, QQ_CONNECT_STEPS);
+	purple_connection_update_progress(gc, _("Connecting to server ..."), 1, QQ_CONNECT_STEPS);
 
 	purple_debug_info("QQ", "Connect to %s:%d\n", server, port);
 
@@ -951,7 +951,7 @@ gboolean connect_to_server(PurpleConnect
 		qd->conn_data = purple_proxy_connect_udp(gc, account, server, port, connect_cb, gc);
 	}
 	if ( qd->conn_data == NULL ) {
-		purple_debug_error("QQ", _("Couldn't create socket"));
+		purple_debug_error("QQ", "Couldn't create socket");
 		return FALSE;
 	}
 #else
============================================================
--- libpurple/protocols/qq/qq_process.c	645bf9755bd670a312dd5b556b982a90a36e466e
+++ libpurple/protocols/qq/qq_process.c	85b85aafdc6f083c813b9d530db2d28d2310e2d1
@@ -796,7 +796,7 @@ void qq_proc_room_cmds(PurpleConnection 
 						seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
 			} else {
 				purple_debug_warning("QQ",
-					   _("Not a member of room \"%s\"\n"), rmd->title_utf8);
+					   "Not a member of room \"%s\"\n", rmd->title_utf8);
 				rmd->my_role = QQ_ROOM_ROLE_NO;
 			}
 			break;