changeset 17744:ffd85797ecab

merge of '2b7fcf2f374857067e0da4b3282e0bf752797dbe' and 'cb06f346593a44e50642b851410b16c1b39e3d95'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 23 May 2007 03:09:25 +0000
parents 3c3b0b89b87a (current diff) 93fa59b2623e (diff)
children 8d3c28521112
files
diffstat 41 files changed, 9192 insertions(+), 10977 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Tue May 22 12:55:56 2007 +0000
+++ b/AUTHORS	Wed May 23 03:09:25 2007 +0000
@@ -3,8 +3,7 @@
 
 For a complete list of all contributors, see the COPYRIGHT file.
 
-We've got an IRC room now too, #pidgin on irc.freenode.net
-(#pidgin-win32 for Windows users). Come check us out.
+We've got an IRC room now too, #pidgin on irc.freenode.net. Come check us out.
 
 Current Developers:
 ------------------
--- a/libpurple/protocols/msn/msn.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Wed May 23 03:09:25 2007 +0000
@@ -1297,7 +1297,12 @@
 
 	conv = swboard->conv;
 
-	msn_switchboard_release(swboard, MSN_SB_FLAG_IM);
+	/* If we release the switchboard here, it may still have messages
+	   pending ACK which would result in incorrect unsent message errors.
+	   Just let it timeout... This is *so* going to screw with people who
+	   use dumb clients that report "User has closed the conversation window" */
+	/* msn_switchboard_release(swboard, MSN_SB_FLAG_IM); */
+	swboard->conv = NULL;
 
 	/* If other switchboards managed to associate themselves with this
 	 * conv, make sure they know it's gone! */
--- a/libpurple/protocols/oscar/bstream.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/bstream.c	Wed May 23 03:09:25 2007 +0000
@@ -172,10 +172,10 @@
 {
 	guint8 *ob;
 
-	ob = malloc(len);
+	ob = g_malloc(len);
 
 	if (byte_stream_getrawbuf(bs, ob, len) < len) {
-		free(ob);
+		g_free(ob);
 		return NULL;
 	}
 
@@ -186,10 +186,10 @@
 {
 	char *ob;
 
-	ob = malloc(len + 1);
+	ob = g_malloc(len + 1);
 
 	if (byte_stream_getrawbuf(bs, (guint8 *)ob, len) < len) {
-		free(ob);
+		g_free(ob);
 		return NULL;
 	}
 
--- a/libpurple/protocols/oscar/family_admin.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_admin.c	Wed May 23 03:09:25 2007 +0000
@@ -81,12 +81,12 @@
 
 		switch (type) {
 			case 0x0001: {
-				free(sn);
+				g_free(sn);
 				sn = byte_stream_getstr(bs, length);
 			} break;
 
 			case 0x0004: {
-				free(url);
+				g_free(url);
 				url = byte_stream_getstr(bs, length);
 			} break;
 
@@ -95,7 +95,7 @@
 			} break;
 
 			case 0x0011: {
-				free(email);
+				g_free(email);
 				if (length == 0)
 					email = g_strdup("*suppressed");
 				else
@@ -109,9 +109,9 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		userfunc(od, conn, frame, (snac->subtype == 0x0005) ? 1 : 0, perms, err, url, sn, email);
 
-	free(sn);
-	free(url);
-	free(email);
+	g_free(sn);
+	g_free(url);
+	g_free(email);
 
 	return 1;
 }
--- a/libpurple/protocols/oscar/family_alert.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_alert.c	Wed May 23 03:09:25 2007 +0000
@@ -111,10 +111,10 @@
 	for (new = od->emailinfo; (new && memcmp(cookie16, new->cookie16, 16)); new = new->next);
 	if (new) {
 		/* Free some of the old info, if it exists */
-		free(new->cookie8);
-		free(new->cookie16);
-		free(new->url);
-		free(new->domain);
+		g_free(new->cookie8);
+		g_free(new->cookie16);
+		g_free(new->url);
+		g_free(new->domain);
 	} else {
 		/* We don't already have info, so create a new struct for it */
 		new = g_new0(struct aim_emailinfo, 1);
@@ -154,8 +154,8 @@
 
 	aim_tlvlist_free(&tlvlist);
 
-	free(alertitle);
-	free(alerturl);
+	g_free(alertitle);
+	g_free(alerturl);
 
 	return ret;
 }
@@ -210,11 +210,11 @@
 	{
 		struct aim_emailinfo *tmp = od->emailinfo;
 		od->emailinfo = od->emailinfo->next;
-		free(tmp->cookie16);
-		free(tmp->cookie8);
-		free(tmp->url);
-		free(tmp->domain);
-		free(tmp);
+		g_free(tmp->cookie16);
+		g_free(tmp->cookie8);
+		g_free(tmp->url);
+		g_free(tmp->domain);
+		g_free(tmp);
 	}
 
 	return;
--- a/libpurple/protocols/oscar/family_auth.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_auth.c	Wed May 23 03:09:25 2007 +0000
@@ -134,7 +134,7 @@
 	guint8 *password_encoded;
 
 	passwdlen = strlen(password);
-	password_encoded = (guint8 *)malloc(passwdlen+1);
+	password_encoded = (guint8 *)g_malloc(passwdlen+1);
 	if (passwdlen > MAXICQPASSLEN)
 		passwdlen = MAXICQPASSLEN;
 
@@ -159,7 +159,7 @@
 
 	aim_tlvlist_write(&frame->data, &tl);
 
-	free(password_encoded);
+	g_free(password_encoded);
 	aim_tlvlist_free(&tl);
 
 	flap_connection_send(conn, frame);
@@ -531,7 +531,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, keystr);
 
-	free(keystr);
+	g_free(keystr);
 
 	return ret;
 }
@@ -589,18 +589,18 @@
 {
 	if (od->authinfo != NULL)
 	{
-		free(od->authinfo->sn);
-		free(od->authinfo->bosip);
-		free(od->authinfo->errorurl);
-		free(od->authinfo->email);
-		free(od->authinfo->chpassurl);
-		free(od->authinfo->latestrelease.name);
-		free(od->authinfo->latestrelease.url);
-		free(od->authinfo->latestrelease.info);
-		free(od->authinfo->latestbeta.name);
-		free(od->authinfo->latestbeta.url);
-		free(od->authinfo->latestbeta.info);
-		free(od->authinfo);
+		g_free(od->authinfo->sn);
+		g_free(od->authinfo->bosip);
+		g_free(od->authinfo->errorurl);
+		g_free(od->authinfo->email);
+		g_free(od->authinfo->chpassurl);
+		g_free(od->authinfo->latestrelease.name);
+		g_free(od->authinfo->latestrelease.url);
+		g_free(od->authinfo->latestrelease.info);
+		g_free(od->authinfo->latestbeta.name);
+		g_free(od->authinfo->latestbeta.url);
+		g_free(od->authinfo->latestbeta.info);
+		g_free(od->authinfo);
 	}
 }
 
--- a/libpurple/protocols/oscar/family_bart.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_bart.c	Wed May 23 03:09:25 2007 +0000
@@ -151,9 +151,9 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, iconcsumtype, iconcsum, iconcsumlen, icon, iconlen);
 
-	free(sn);
-	free(iconcsum);
-	free(icon);
+	g_free(sn);
+	g_free(iconcsum);
+	g_free(icon);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/family_bos.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_bos.c	Wed May 23 03:09:25 2007 +0000
@@ -136,7 +136,7 @@
 	else
 		return -EINVAL;
 
-	localcpy = strdup(denylist);
+	localcpy = g_strdup(denylist);
 
 	listcount = aimutil_itemcnt(localcpy, '&');
 	packlen = aimutil_tokslen(localcpy, 99, '&') + listcount + 9;
@@ -152,9 +152,9 @@
 		byte_stream_put8(&frame->data, strlen(tmpptr));
 		byte_stream_putstr(&frame->data, tmpptr);
 
-		free(tmpptr);
+		g_free(tmpptr);
 	}
-	free(localcpy);
+	g_free(localcpy);
 
 	flap_connection_send(conn, frame);
 
--- a/libpurple/protocols/oscar/family_buddy.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_buddy.c	Wed May 23 03:09:25 2007 +0000
@@ -135,7 +135,7 @@
 	char *localcpy = NULL;
 	char *tmpptr = NULL;
 
-	if (!buddy_list || !(localcpy = strdup(buddy_list)))
+	if (!buddy_list || !(localcpy = g_strdup(buddy_list)))
 		return -EINVAL;
 
 	for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
@@ -162,7 +162,7 @@
 
 	flap_connection_send(conn, frame);
 
-	free(localcpy);
+	g_free(localcpy);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_chat.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_chat.c	Wed May 23 03:09:25 2007 +0000
@@ -41,8 +41,8 @@
 	struct chatconnpriv *ccp = (struct chatconnpriv *)conn->internal;
 
 	if (ccp)
-		free(ccp->name);
-	free(ccp);
+		g_free(ccp->name);
+	g_free(ccp);
 
 	return;
 }
@@ -100,12 +100,12 @@
 		return -EINVAL;
 
 	if (conn->internal)
-		free(conn->internal);
+		g_free(conn->internal);
 
 	ccp = g_new(struct chatconnpriv, 1);
 
 	ccp->exchange = exchange;
-	ccp->name = strdup(roomname);
+	ccp->name = g_strdup(roomname);
 	ccp->instance = instance;
 
 	conn->internal = (void *)ccp;
@@ -203,7 +203,7 @@
 		ByteStream occbs;
 
 		/* Allocate enough userinfo structs for all occupants */
-		userinfo = calloc(usercount, sizeof(aim_userinfo_t));
+		userinfo = g_new0(aim_userinfo_t, usercount);
 
 		byte_stream_init(&occbs, tlv->value, tlv->length);
 
@@ -301,14 +301,14 @@
 				maxvisiblemsglen);
 	}
 
-	free(roominfo.name);
+	g_free(roominfo.name);
 
 	while (usercount > 0)
 		aim_info_free(&userinfo[--usercount]);
 
-	free(userinfo);
-	free(roomname);
-	free(roomdesc);
+	g_free(userinfo);
+	g_free(roomname);
+	g_free(roomdesc);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
@@ -324,7 +324,7 @@
 
 	while (byte_stream_empty(bs)) {
 		curcount++;
-		userinfo = realloc(userinfo, curcount * sizeof(aim_userinfo_t));
+		userinfo = g_realloc(userinfo, curcount * sizeof(aim_userinfo_t));
 		aim_info_extract(od, bs, &userinfo[curcount-1]);
 	}
 
@@ -332,7 +332,7 @@
 		ret = userfunc(od, conn, frame, curcount, userinfo);
 
 	aim_info_free(userinfo);
-	free(userinfo);
+	g_free(userinfo);
 
 	return ret;
 }
@@ -488,8 +488,8 @@
 		cookie[i] = byte_stream_get8(bs);
 
 	if ((ck = aim_uncachecookie(od, cookie, AIM_COOKIETYPE_CHAT))) {
-		free(ck->data);
-		free(ck);
+		g_free(ck->data);
+		g_free(ck);
 	}
 
 	/*
@@ -569,9 +569,9 @@
 		ret = userfunc(od, conn, frame, &userinfo, len, msg, encoding, language);
 
 	aim_info_free(&userinfo);
-	free(msg);
-	free(encoding);
-	free(language);
+	g_free(msg);
+	g_free(encoding);
+	g_free(language);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
--- a/libpurple/protocols/oscar/family_chatnav.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_chatnav.c	Wed May 23 03:09:25 2007 +0000
@@ -133,7 +133,7 @@
 
 		curexchange++;
 
-		exchanges = realloc(exchanges, curexchange * sizeof(struct aim_chat_exchangeinfo));
+		exchanges = g_realloc(exchanges, curexchange * sizeof(struct aim_chat_exchangeinfo));
 
 		/* exchange number */
 		exchanges[curexchange-1].number = byte_stream_get16(&tbs);
@@ -300,13 +300,13 @@
 		ret = userfunc(od, conn, frame, snac2->type, maxrooms, curexchange, exchanges);
 
 	for (curexchange--; curexchange >= 0; curexchange--) {
-		free(exchanges[curexchange].name);
-		free(exchanges[curexchange].charset1);
-		free(exchanges[curexchange].lang1);
-		free(exchanges[curexchange].charset2);
-		free(exchanges[curexchange].lang2);
+		g_free(exchanges[curexchange].name);
+		g_free(exchanges[curexchange].charset1);
+		g_free(exchanges[curexchange].lang1);
+		g_free(exchanges[curexchange].charset2);
+		g_free(exchanges[curexchange].lang2);
 	}
-	free(exchanges);
+	g_free(exchanges);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
@@ -345,7 +345,7 @@
 	if (detaillevel != 0x02) {
 		purple_debug_misc("oscar", "unknown detaillevel in create room response (0x%02x)\n", detaillevel);
 		aim_tlvlist_free(&tlvlist);
-		free(ck);
+		g_free(ck);
 		return 0;
 	}
 
@@ -378,9 +378,9 @@
 		ret = userfunc(od, conn, frame, snac2->type, fqcn, instance, exchange, flags, createtime, maxmsglen, maxoccupancy, createperms, unknown, name, ck);
 	}
 
-	free(ck);
-	free(name);
-	free(fqcn);
+	g_free(ck);
+	g_free(name);
+	g_free(fqcn);
 	aim_tlvlist_free(&innerlist);
 	aim_tlvlist_free(&tlvlist);
 
@@ -442,8 +442,8 @@
 		purple_debug_misc("oscar", "chatnav_parse_info: unknown request subtype (%04x)\n", snac2->type);
 
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/family_feedbag.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Wed May 23 03:09:25 2007 +0000
@@ -81,7 +81,7 @@
 	if (newlen > 0) {
 		guint8 *newdata;
 
-		newdata = (guint8 *)malloc((newlen)*sizeof(guint8));
+		newdata = (guint8 *)g_malloc((newlen)*sizeof(guint8));
 		newlen = 0;
 		if (group->gid == 0x0000) {
 			for (cur=list; cur; cur=cur->next)
@@ -94,7 +94,7 @@
 		}
 		aim_tlvlist_replace_raw(&group->data, 0x00c8, newlen, newdata);
 
-		free(newdata);
+		g_free(newdata);
 	}
 }
 
@@ -115,11 +115,11 @@
 	gboolean exists;
 	struct aim_ssi_item *cur, *new;
 
-	new = (struct aim_ssi_item *)malloc(sizeof(struct aim_ssi_item));
+	new = (struct aim_ssi_item *)g_malloc(sizeof(struct aim_ssi_item));
 
 	/* Set the name */
 	if (name) {
-		new->name = (char *)malloc((strlen(name)+1)*sizeof(char));
+		new->name = (char *)g_malloc((strlen(name)+1)*sizeof(char));
 		strcpy(new->name, name);
 	} else
 		new->name = NULL;
@@ -213,9 +213,9 @@
 	}
 
 	/* Free the removed item */
-	free(del->name);
+	g_free(del->name);
 	aim_tlvlist_free(&del->data);
-	free(del);
+	g_free(del);
 
 	return 0;
 }
@@ -510,7 +510,7 @@
 		for (cur1=od->ssi.local; cur1 && (n < 15); cur1=cur1->next) {
 			if (!aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid)) {
 				n++;
-				new = (struct aim_ssi_tmp *)malloc(sizeof(struct aim_ssi_tmp));
+				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
 				new->action = SNAC_SUBTYPE_FEEDBAG_ADD;
 				new->ack = 0xffff;
 				new->name = NULL;
@@ -530,7 +530,7 @@
 		for (cur1=od->ssi.official; cur1 && (n < 15); cur1=cur1->next) {
 			if (!aim_ssi_itemlist_find(od->ssi.local, cur1->gid, cur1->bid)) {
 				n++;
-				new = (struct aim_ssi_tmp *)malloc(sizeof(struct aim_ssi_tmp));
+				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
 				new->action = SNAC_SUBTYPE_FEEDBAG_DEL;
 				new->ack = 0xffff;
 				new->name = NULL;
@@ -551,7 +551,7 @@
 			cur2 = aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid);
 			if (cur2 && (aim_ssi_itemlist_cmp(cur1, cur2))) {
 				n++;
-				new = (struct aim_ssi_tmp *)malloc(sizeof(struct aim_ssi_tmp));
+				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
 				new->action = SNAC_SUBTYPE_FEEDBAG_MOD;
 				new->ack = 0xffff;
 				new->name = NULL;
@@ -609,25 +609,25 @@
 	while (cur) {
 		del = cur;
 		cur = cur->next;
-		free(del->name);
+		g_free(del->name);
 		aim_tlvlist_free(&del->data);
-		free(del);
+		g_free(del);
 	}
 
 	cur = od->ssi.local;
 	while (cur) {
 		del = cur;
 		cur = cur->next;
-		free(del->name);
+		g_free(del->name);
 		aim_tlvlist_free(&del->data);
-		free(del);
+		g_free(del);
 	}
 
 	curtmp = od->ssi.pending;
 	while (curtmp) {
 		deltmp = curtmp;
 		curtmp = curtmp->next;
-		free(deltmp);
+		g_free(deltmp);
 	}
 
 	od->ssi.numitems = 0;
@@ -672,7 +672,7 @@
 			char *alias = aim_ssi_getalias(od->ssi.local, NULL, cur->name);
 			aim_ssi_addbuddy(od, cur->name, "orphans", alias, NULL, NULL, 0);
 			aim_ssi_delbuddy(od, cur->name, NULL);
-			free(alias);
+			g_free(alias);
 		}
 		cur = next;
 	}
@@ -929,7 +929,7 @@
 	aim_ssi_delbuddy(od, sn, oldgn);
 	aim_ssi_addbuddy(od, sn, newgn, alias, NULL, NULL, waitingforauth);
 
-	free(alias);
+	g_free(alias);
 
 	return 0;
 }
@@ -1012,8 +1012,8 @@
 	if (!(group = aim_ssi_itemlist_finditem(od->ssi.local, oldgn, NULL, AIM_SSI_TYPE_GROUP)))
 		return -EINVAL;
 
-	free(group->name);
-	group->name = (char *)malloc((strlen(newgn)+1)*sizeof(char));
+	g_free(group->name);
+	group->name = (char *)g_malloc((strlen(newgn)+1)*sizeof(char));
 	strcpy(group->name, newgn);
 
 	/* Sync our local list with the server list */
@@ -1086,12 +1086,12 @@
 	}
 
 	/* Need to add the 0x00d5 TLV to the TLV chain */
-	csumdata = (guint8 *)malloc((iconsumlen+2)*sizeof(guint8));
+	csumdata = (guint8 *)g_malloc((iconsumlen+2)*sizeof(guint8));
 	aimutil_put8(&csumdata[0], 0x00);
 	aimutil_put8(&csumdata[1], iconsumlen);
 	memcpy(&csumdata[2], iconsum, iconsumlen);
 	aim_tlvlist_replace_raw(&tmp->data, 0x00d5, (iconsumlen+2) * sizeof(guint8), csumdata);
-	free(csumdata);
+	g_free(csumdata);
 
 	/* Need to add the 0x0131 TLV to the TLV chain, used to cache the icon */
 	aim_tlvlist_replace_noval(&tmp->data, 0x0131);
@@ -1188,7 +1188,7 @@
 
 	byte_stream_init(&bstream, tlv->value, tlv->length);
 
-	maxitems = (guint16 *)malloc((tlv->length/2)*sizeof(guint16));
+	maxitems = (guint16 *)g_malloc((tlv->length/2)*sizeof(guint16));
 
 	for (i=0; i<(tlv->length/2); i++)
 		maxitems[i] = byte_stream_get16(&bstream);
@@ -1197,7 +1197,7 @@
 		ret = userfunc(od, conn, frame, tlv->length/2, maxitems);
 
 	aim_tlvlist_free(&tlvlist);
-	free(maxitems);
+	g_free(maxitems);
 
 	return ret;
 }
@@ -1283,7 +1283,7 @@
 		type = byte_stream_get16(bs);
 		data = aim_tlvlist_readlen(bs, byte_stream_get16(bs));
 		aim_ssi_itemlist_add(&od->ssi.official, name, gid, bid, type, data);
-		free(name);
+		g_free(name);
 		aim_tlvlist_free(&data);
 	}
 
@@ -1411,7 +1411,7 @@
 		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 			ret = userfunc(od, conn, frame, type, name);
 
-		free(name);
+		g_free(name);
 	}
 
 	return ret;
@@ -1447,9 +1447,9 @@
 		/* Replace the 2 local items with the given one */
 		if ((item = aim_ssi_itemlist_find(od->ssi.local, gid, bid))) {
 			item->type = type;
-			free(item->name);
+			g_free(item->name);
 			if (name) {
-				item->name = (char *)malloc((strlen(name)+1)*sizeof(char));
+				item->name = (char *)g_malloc((strlen(name)+1)*sizeof(char));
 				strcpy(item->name, name);
 			} else
 				item->name = NULL;
@@ -1459,9 +1459,9 @@
 
 		if ((item = aim_ssi_itemlist_find(od->ssi.official, gid, bid))) {
 			item->type = type;
-			free(item->name);
+			g_free(item->name);
 			if (name) {
-				item->name = (char *)malloc((strlen(name)+1)*sizeof(char));
+				item->name = (char *)g_malloc((strlen(name)+1)*sizeof(char));
 				strcpy(item->name, name);
 			} else
 				item->name = NULL;
@@ -1472,7 +1472,7 @@
 		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 			ret = userfunc(od, conn, frame);
 
-		free(name);
+		g_free(name);
 		aim_tlvlist_free(&data);
 	}
 
@@ -1543,7 +1543,7 @@
 				/* Make sure cur->item is still valid memory */
 				if (aim_ssi_itemlist_valid(od->ssi.local, cur->item)) {
 					if (cur->item->name) {
-						cur->name = (char *)malloc((strlen(cur->item->name)+1)*sizeof(char));
+						cur->name = (char *)g_malloc((strlen(cur->item->name)+1)*sizeof(char));
 						strcpy(cur->name, cur->item->name);
 					}
 					aim_ssi_itemlist_del(&od->ssi.local, cur->item);
@@ -1555,9 +1555,9 @@
 				if (aim_ssi_itemlist_valid(od->ssi.local, cur->item)) {
 					struct aim_ssi_item *cur1;
 					if ((cur1 = aim_ssi_itemlist_find(od->ssi.official, cur->item->gid, cur->item->bid))) {
-						free(cur->item->name);
+						g_free(cur->item->name);
 						if (cur1->name) {
-							cur->item->name = (char *)malloc((strlen(cur1->name)+1)*sizeof(char));
+							cur->item->name = (char *)g_malloc((strlen(cur1->name)+1)*sizeof(char));
 							strcpy(cur->item->name, cur1->name);
 						} else
 							cur->item->name = NULL;
@@ -1589,9 +1589,9 @@
 				if (aim_ssi_itemlist_valid(od->ssi.local, cur->item)) {
 					struct aim_ssi_item *cur1;
 					if ((cur1 = aim_ssi_itemlist_find(od->ssi.official, cur->item->gid, cur->item->bid))) {
-						free(cur1->name);
+						g_free(cur1->name);
 						if (cur->item->name) {
-							cur1->name = (char *)malloc((strlen(cur->item->name)+1)*sizeof(char));
+							cur1->name = (char *)g_malloc((strlen(cur->item->name)+1)*sizeof(char));
 							strcpy(cur1->name, cur->item->name);
 						} else
 							cur1->name = NULL;
@@ -1620,8 +1620,8 @@
 	while (cur && (cur->ack != 0xffff)) {
 		del = cur;
 		cur = cur->next;
-		free(del->name);
-		free(del);
+		g_free(del->name);
+		g_free(del);
 	}
 	od->ssi.pending = cur;
 
@@ -1757,8 +1757,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, msg);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 
 	return ret;
 }
@@ -1831,8 +1831,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, msg);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 
 	return ret;
 }
@@ -1918,8 +1918,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, reply, msg);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 
 	return ret;
 }
@@ -1943,7 +1943,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn);
 
-	free(sn);
+	g_free(sn);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/family_icbm.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Wed May 23 03:09:25 2007 +0000
@@ -468,16 +468,16 @@
 	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* XXX should be uncached by an unwritten 'invite accept' handler */
-	priv = malloc(sizeof(struct aim_invite_priv));
-	priv->sn = strdup(sn);
-	priv->roomname = strdup(roomname);
+	priv = g_malloc(sizeof(struct aim_invite_priv));
+	priv->sn = g_strdup(sn);
+	priv->roomname = g_strdup(roomname);
 	priv->exchange = exchange;
 	priv->instance = instance;
 
 	if ((msgcookie = aim_mkcookie(cookie, AIM_COOKIETYPE_INVITE, priv)))
 		aim_cachecookie(od, msgcookie);
 	else
-		free(priv);
+		g_free(priv);
 
 	/* ICBM Header */
 	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
@@ -1279,8 +1279,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, channel, sn, msg, icbmflags, flag1, flag2);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
@@ -1335,7 +1335,7 @@
 {
 	aim_mpmsg_section_t *sec;
 
-	sec = malloc(sizeof(aim_mpmsg_section_t));
+	sec = g_malloc(sizeof(aim_mpmsg_section_t));
 
 	sec->charset = charset;
 	sec->charsubset = charsubset;
@@ -1362,11 +1362,11 @@
 {
 	gchar *dup;
 
-	dup = malloc(datalen);
+	dup = g_malloc(datalen);
 	memcpy(dup, data, datalen);
 
 	if (mpmsg_addsection(od, mpm, charset, charsubset, dup, datalen) == -1) {
-		free(dup);
+		g_free(dup);
 		return -1;
 	}
 
@@ -1378,11 +1378,11 @@
 {
 	gchar *dup;
 
-	if (!(dup = strdup(ascii)))
+	if (!(dup = g_strdup(ascii)))
 		return -1;
 
 	if (mpmsg_addsection(od, mpm, 0x0000, 0x0000, dup, strlen(ascii)) == -1) {
-		free(dup);
+		g_free(dup);
 		return -1;
 	}
 
@@ -1395,7 +1395,7 @@
 	ByteStream bs;
 	int i;
 
-	buf = malloc(unicodelen * 2);
+	buf = g_malloc(unicodelen * 2);
 
 	byte_stream_init(&bs, (guchar *)buf, unicodelen * 2);
 
@@ -1404,7 +1404,7 @@
 		byte_stream_put16(&bs, unicode[i]);
 
 	if (mpmsg_addsection(od, mpm, 0x0002, 0x0000, buf, byte_stream_curpos(&bs)) == -1) {
-		free(buf);
+		g_free(buf);
 		return -1;
 	}
 
@@ -1419,8 +1419,8 @@
 		aim_mpmsg_section_t *tmp;
 
 		tmp = cur->next;
-		free(cur->data);
-		free(cur);
+		g_free(cur->data);
+		g_free(cur);
 		cur = tmp;
 	}
 
@@ -1659,7 +1659,7 @@
 				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
 				break;
 			}
-			free(args.extdata);
+			g_free(args.extdata);
 			args.extdatalen = length;
 			if (args.extdatalen == 0)
 				args.extdata = NULL;
@@ -1686,8 +1686,8 @@
 		ret = userfunc(od, conn, frame, channel, userinfo, &args);
 
 	aim_mpmsg_free(od, &args.mpmsg);
-	free(args.features);
-	free(args.extdata);
+	g_free(args.features);
+	g_free(args.extdata);
 
 	return ret;
 }
@@ -1733,10 +1733,10 @@
 
 			purple_debug_misc("oscar", "got a buddy list from %s: group %s, buddy %s\n", userinfo->sn, gn, bn);
 
-			free(bn);
+			g_free(bn);
 		}
 
-		free(gn);
+		g_free(gn);
 	}
 
 	return;
@@ -1745,7 +1745,7 @@
 static void
 incomingim_ch2_buddyicon_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	free(args->info.icon.icon);
+	g_free(args->info.icon.icon);
 
 	return;
 }
@@ -1767,7 +1767,7 @@
 incomingim_ch2_chat_free(OscarData *od, IcbmArgsCh2 *args)
 {
 	/* XXX - aim_chat_roominfo_free() */
-	free(args->info.chat.roominfo.name);
+	g_free(args->info.chat.roominfo.name);
 
 	return;
 }
@@ -1786,7 +1786,7 @@
 static void
 incomingim_ch2_icqserverrelay_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	free((char *)args->info.rtfmsg.rtfmsg);
+	g_free((char *)args->info.rtfmsg.rtfmsg);
 }
 
 /*
@@ -1832,7 +1832,7 @@
 static void
 incomingim_ch2_sendfile_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	free(args->info.sendfile.filename);
+	g_free(args->info.sendfile.filename);
 }
 
 /* Someone is sending us a file */
@@ -1918,11 +1918,11 @@
 	{
 		purple_debug_warning("oscar",
 				"Cookies don't match in rendezvous ICBM, bailing out.\n");
-		free(cookie2);
+		g_free(cookie2);
 		return 1;
 	}
 	memcpy(args.cookie, cookie2, 8);
-	free(cookie2);
+	g_free(cookie2);
 
 	/*
 	 * The next 16bytes are a capability block so we can
@@ -2074,9 +2074,9 @@
 	if (args.destructor)
 		((ch2_args_destructor_t)args.destructor)(od, &args);
 
-	free((char *)args.msg);
-	free((char *)args.encoding);
-	free((char *)args.language);
+	g_free((char *)args.msg);
+	g_free((char *)args.encoding);
+	g_free((char *)args.language);
 
 	aim_tlvlist_free(&list2);
 
@@ -2107,7 +2107,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, channel, userinfo, &args);
 
-	free(args.msg);
+	g_free(args.msg);
 
 	return ret;
 }
@@ -2210,7 +2210,7 @@
 	}
 
 	aim_info_free(&userinfo);
-	free(cookie);
+	g_free(cookie);
 
 	return ret;
 }
@@ -2379,7 +2379,7 @@
 				if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 					ret = userfunc(od, conn, frame, channel, sn, reason, state, msg);
 
-				free(msg);
+				g_free(msg);
 			} break;
 
 			default: {
@@ -2389,8 +2389,8 @@
 		} /* end switch */
 	}
 
-	free(cookie);
-	free(sn);
+	g_free(cookie);
+	g_free(sn);
 
 	return ret;
 }
@@ -2418,8 +2418,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, ch, sn);
 
-	free(sn);
-	free(cookie);
+	g_free(sn);
+	g_free(cookie);
 
 	return ret;
 }
@@ -2502,7 +2502,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, type1, sn, type2);
 
-	free(sn);
+	g_free(sn);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/family_icq.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_icq.c	Wed May 23 03:09:25 2007 +0000
@@ -212,7 +212,7 @@
 	flap_connection_send(conn, frame);
 
 	/* Keep track of this request and the ICQ number and request ID */
-	info = (struct aim_icq_info *)calloc(1, sizeof(struct aim_icq_info));
+	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
 	info->uin = atoi(uin);
 	info->next = od->icq_info;
@@ -256,7 +256,7 @@
 	flap_connection_send(conn, frame);
 
 	/* Keep track of this request and the ICQ number and request ID */
-	info = (struct aim_icq_info *)calloc(1, sizeof(struct aim_icq_info));
+	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
 	info->uin = atoi(uin);
 	info->next = od->icq_info;
@@ -426,7 +426,7 @@
 
 	flap_connection_send(conn, frame);
 
-	free(xml);
+	g_free(xml);
 
 	return 0;
 }
@@ -437,34 +437,34 @@
 
 	if (!info)
 		return;
-	free(info->nick);
-	free(info->first);
-	free(info->last);
-	free(info->email);
-	free(info->homecity);
-	free(info->homestate);
-	free(info->homephone);
-	free(info->homefax);
-	free(info->homeaddr);
-	free(info->mobile);
-	free(info->homezip);
-	free(info->personalwebpage);
+	g_free(info->nick);
+	g_free(info->first);
+	g_free(info->last);
+	g_free(info->email);
+	g_free(info->homecity);
+	g_free(info->homestate);
+	g_free(info->homephone);
+	g_free(info->homefax);
+	g_free(info->homeaddr);
+	g_free(info->mobile);
+	g_free(info->homezip);
+	g_free(info->personalwebpage);
 	if (info->email2)
 		for (i = 0; i < info->numaddresses; i++)
-			free(info->email2[i]);
-	free(info->email2);
-	free(info->workcity);
-	free(info->workstate);
-	free(info->workphone);
-	free(info->workfax);
-	free(info->workaddr);
-	free(info->workzip);
-	free(info->workcompany);
-	free(info->workdivision);
-	free(info->workposition);
-	free(info->workwebpage);
-	free(info->info);
-	free(info);
+			g_free(info->email2[i]);
+	g_free(info->email2);
+	g_free(info->workcity);
+	g_free(info->workstate);
+	g_free(info->workphone);
+	g_free(info->workfax);
+	g_free(info->workaddr);
+	g_free(info->workzip);
+	g_free(info->workcompany);
+	g_free(info->workdivision);
+	g_free(info->workposition);
+	g_free(info->workwebpage);
+	g_free(info->info);
+	g_free(info);
 }
 
 /**
@@ -515,7 +515,7 @@
 		if ((userfunc = aim_callhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_OFFLINEMSG)))
 			ret = userfunc(od, conn, frame, &msg);
 
-		free(msg.msg);
+		g_free(msg.msg);
 
 	} else if (cmd == 0x0042) {
 		aim_rxcallback_t userfunc;
@@ -534,7 +534,7 @@
 		/* find other data from the same request */
 		for (info = od->icq_info; info && (info->reqid != reqid); info = info->next);
 		if (!info) {
-			info = (struct aim_icq_info *)calloc(1, sizeof(struct aim_icq_info));
+			info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 			info->reqid = reqid;
 			info->next = od->icq_info;
 			od->icq_info = info;
@@ -603,7 +603,7 @@
 		case 0x00eb: { /* email address(es) */
 			int i;
 			info->numaddresses = byte_stream_getle16(&qbs);
-			info->email2 = (char **)calloc(info->numaddresses, sizeof(char *));
+			info->email2 = (char **)g_new0(char *, info->numaddresses);
 			for (i = 0; i < info->numaddresses; i++) {
 				info->email2[i] = byte_stream_getstr(&qbs, byte_stream_getle16(&qbs));
 				if (i+1 != info->numaddresses)
--- a/libpurple/protocols/oscar/family_locate.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Wed May 23 03:09:25 2007 +0000
@@ -238,8 +238,8 @@
 	cur = aim_locate_finduserinfo(od, userinfo->sn);
 
 	if (cur == NULL) {
-		cur = (aim_userinfo_t *)calloc(1, sizeof(aim_userinfo_t));
-		cur->sn = strdup(userinfo->sn);
+		cur = (aim_userinfo_t *)g_new0(aim_userinfo_t, 1);
+		cur->sn = g_strdup(userinfo->sn);
 		cur->next = od->locate.userinfo;
 		od->locate.userinfo = cur;
 	}
@@ -261,63 +261,63 @@
 	cur->present |= userinfo->present;
 
 	if (userinfo->iconcsumlen > 0) {
-		free(cur->iconcsum);
-		cur->iconcsum = (guint8 *)malloc(userinfo->iconcsumlen);
+		g_free(cur->iconcsum);
+		cur->iconcsum = (guint8 *)g_malloc(userinfo->iconcsumlen);
 		memcpy(cur->iconcsum, userinfo->iconcsum, userinfo->iconcsumlen);
 		cur->iconcsumlen = userinfo->iconcsumlen;
 	}
 
 	if (userinfo->info != NULL) {
-		free(cur->info);
-		free(cur->info_encoding);
+		g_free(cur->info);
+		g_free(cur->info_encoding);
 		if (userinfo->info_len > 0) {
-			cur->info = (char *)malloc(userinfo->info_len);
+			cur->info = (char *)g_malloc(userinfo->info_len);
 			memcpy(cur->info, userinfo->info, userinfo->info_len);
 		} else
 			cur->info = NULL;
-		cur->info_encoding = strdup(userinfo->info_encoding);
+		cur->info_encoding = g_strdup(userinfo->info_encoding);
 		cur->info_len = userinfo->info_len;
 	}
 
 	if (userinfo->status != NULL) {
-		free(cur->status);
-		free(cur->status_encoding);
+		g_free(cur->status);
+		g_free(cur->status_encoding);
 		if (userinfo->status_len > 0) {
-			cur->status = (char *)malloc(userinfo->status_len);
+			cur->status = (char *)g_malloc(userinfo->status_len);
 			memcpy(cur->status, userinfo->status, userinfo->status_len);
 		} else
 			cur->status = NULL;
 		if (userinfo->status_encoding != NULL)
-			cur->status_encoding = strdup(userinfo->status_encoding);
+			cur->status_encoding = g_strdup(userinfo->status_encoding);
 		else
 			cur->status_encoding = NULL;
 		cur->status_len = userinfo->status_len;
 	}
 
 	if (userinfo->itmsurl != NULL) {
-		free(cur->itmsurl);
-		free(cur->itmsurl_encoding);
+		g_free(cur->itmsurl);
+		g_free(cur->itmsurl_encoding);
 		if (userinfo->itmsurl_len > 0) {
-			cur->itmsurl = (char *)malloc(userinfo->itmsurl_len);
+			cur->itmsurl = (char *)g_malloc(userinfo->itmsurl_len);
 			memcpy(cur->itmsurl, userinfo->itmsurl, userinfo->itmsurl_len);
 		} else
 			cur->itmsurl = NULL;
 		if (userinfo->itmsurl_encoding != NULL)
-			cur->itmsurl_encoding = strdup(userinfo->itmsurl_encoding);
+			cur->itmsurl_encoding = g_strdup(userinfo->itmsurl_encoding);
 		else
 			cur->itmsurl_encoding = NULL;
 		cur->itmsurl_len = userinfo->itmsurl_len;
 	}
 
 	if (userinfo->away != NULL) {
-		free(cur->away);
-		free(cur->away_encoding);
+		g_free(cur->away);
+		g_free(cur->away_encoding);
 		if (userinfo->away_len > 0) {
-			cur->away = (char *)malloc(userinfo->away_len);
+			cur->away = (char *)g_malloc(userinfo->away_len);
 			memcpy(cur->away, userinfo->away, userinfo->away_len);
 		} else
 			cur->away = NULL;
-		cur->away_encoding = strdup(userinfo->away_encoding);
+		cur->away_encoding = g_strdup(userinfo->away_encoding);
 		cur->away_len = userinfo->away_len;
 
 	} else if (!(userinfo->flags & AIM_FLAG_AWAY)) {
@@ -326,11 +326,11 @@
 		 * If the user is not away, clear any cached away message now.
 		 */
 		if (cur->away) {
-			free(cur->away);
+			g_free(cur->away);
 			cur->away = NULL;
 		}
 		if (cur->away_encoding) {
-			free(cur->away_encoding);
+			g_free(cur->away_encoding);
 			cur->away_encoding = NULL;
 		}
 		cur->away_len = 0;
@@ -401,8 +401,8 @@
 		del = od->locate.requested;
 		od->locate.requested = del->next;
 		was_explicit = FALSE;
-		free(del->sn);
-		free(del);
+		g_free(del->sn);
+		g_free(del);
 	}
 
 	cur = od->locate.requested;
@@ -411,8 +411,8 @@
 			del = cur->next;
 			cur->next = del->next;
 			was_explicit = FALSE;
-			free(del->sn);
-			free(del);
+			g_free(del->sn);
+			g_free(del);
 		} else
 			cur = cur->next;
 	}
@@ -447,8 +447,8 @@
 	}
 
 	/* Add a new node to our request queue */
-	cur = (struct userinfo_node *)malloc(sizeof(struct userinfo_node));
-	cur->sn = strdup(sn);
+	cur = (struct userinfo_node *)g_malloc(sizeof(struct userinfo_node));
+	cur->sn = g_strdup(sn);
 	cur->next = od->locate.torequest;
 	od->locate.torequest = cur;
 
@@ -502,7 +502,7 @@
 					cap[10], cap[11], cap[12], cap[13],
 					cap[14], cap[15]);
 
-		free(cap);
+		g_free(cap);
 	}
 
 	return flags;
@@ -531,7 +531,7 @@
 		if (!identified)
 			purple_debug_misc("oscar", "unknown short capability: {%02x%02x}\n", cap[0], cap[1]);
 
-		free(cap);
+		g_free(cap);
 	}
 
 	return flags;
@@ -586,16 +586,16 @@
 void
 aim_info_free(aim_userinfo_t *info)
 {
-	free(info->sn);
-	free(info->iconcsum);
-	free(info->info);
-	free(info->info_encoding);
-	free(info->status);
-	free(info->status_encoding);
-	free(info->itmsurl);
-	free(info->itmsurl_encoding);
-	free(info->away);
-	free(info->away_encoding);
+	g_free(info->sn);
+	g_free(info->iconcsum);
+	g_free(info->info);
+	g_free(info->info_encoding);
+	g_free(info->status);
+	g_free(info->status_encoding);
+	g_free(info->itmsurl);
+	g_free(info->itmsurl_encoding);
+	g_free(info->away);
+	g_free(info->away_encoding);
 }
 
 /*
@@ -829,7 +829,7 @@
 
 					case 0x0001: { /* A buddy icon checksum */
 						if ((length2 > 0) && ((number == 0x00) || (number == 0x01))) {
-							free(outinfo->iconcsum);
+							g_free(outinfo->iconcsum);
 							outinfo->iconcsumtype = number;
 							outinfo->iconcsum = byte_stream_getraw(bs, length2);
 							outinfo->iconcsumlen = length2;
@@ -838,8 +838,8 @@
 					} break;
 
 					case 0x0002: { /* A status/available message */
-						free(outinfo->status);
-						free(outinfo->status_encoding);
+						g_free(outinfo->status);
+						g_free(outinfo->status_encoding);
 						if (length2 >= 4) {
 							outinfo->status_len = byte_stream_get16(bs);
 							outinfo->status = byte_stream_getstr(bs, outinfo->status_len);
@@ -859,8 +859,8 @@
 					} break;
 
 					case 0x0009: { /* An iTunes Music Store link */
-						free(outinfo->itmsurl);
-						free(outinfo->itmsurl_encoding);
+						g_free(outinfo->itmsurl);
+						g_free(outinfo->itmsurl_encoding);
 						if (length2 >= 4) {
 							outinfo->itmsurl_len = byte_stream_get16(bs);
 							outinfo->itmsurl = byte_stream_getstr(bs, outinfo->itmsurl_len);
@@ -1013,8 +1013,8 @@
 			ret = userfunc(od, conn, frame, reason, sn);
 
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
@@ -1113,11 +1113,11 @@
 	/* Build the packet first to get real length */
 	if (profile) {
 		/* no + 1 here because of %s */
-		encoding = malloc(strlen(defencoding) + strlen(profile_encoding));
+		encoding = g_malloc(strlen(defencoding) + strlen(profile_encoding));
 		snprintf(encoding, strlen(defencoding) + strlen(profile_encoding), defencoding, profile_encoding);
 		aim_tlvlist_add_str(&tl, 0x0001, encoding);
 		aim_tlvlist_add_raw(&tl, 0x0002, profile_len, (const guchar *)profile);
-		free(encoding);
+		g_free(encoding);
 	}
 
 	/*
@@ -1130,11 +1130,11 @@
 	 */
 	if (awaymsg) {
 		if (awaymsg_len) {
-			encoding = malloc(strlen(defencoding) + strlen(awaymsg_encoding));
+			encoding = g_malloc(strlen(defencoding) + strlen(awaymsg_encoding));
 			snprintf(encoding, strlen(defencoding) + strlen(awaymsg_encoding), defencoding, awaymsg_encoding);
 			aim_tlvlist_add_str(&tl, 0x0003, encoding);
 			aim_tlvlist_add_raw(&tl, 0x0004, awaymsg_len, (const guchar *)awaymsg);
-			free(encoding);
+			g_free(encoding);
 		} else
 			aim_tlvlist_add_noval(&tl, 0x0004);
 	}
@@ -1225,14 +1225,14 @@
 	aim_tlv_t *tlv = NULL;
 	int was_explicit;
 
-	userinfo = (aim_userinfo_t *)malloc(sizeof(aim_userinfo_t));
+	userinfo = (aim_userinfo_t *)g_malloc(sizeof(aim_userinfo_t));
 	aim_info_extract(od, bs, userinfo);
 	tlvlist = aim_tlvlist_read(bs);
 
 	/* Profile will be 1 and 2 */
 	userinfo->info_encoding = aim_tlv_getstr(tlvlist, 0x0001, 1);
 	if ((tlv = aim_tlv_gettlv(tlvlist, 0x0002, 1))) {
-		userinfo->info = (char *)malloc(tlv->length);
+		userinfo->info = (char *)g_malloc(tlv->length);
 		memcpy(userinfo->info, tlv->value, tlv->length);
 		userinfo->info_len = tlv->length;
 	}
@@ -1240,7 +1240,7 @@
 	/* Away message will be 3 and 4 */
 	userinfo->away_encoding = aim_tlv_getstr(tlvlist, 0x0003, 1);
 	if ((tlv = aim_tlv_gettlv(tlvlist, 0x0004, 1))) {
-		userinfo->away = (char *)malloc(tlv->length);
+		userinfo->away = (char *)g_malloc(tlv->length);
 		memcpy(userinfo->away, tlv->value, tlv->length);
 		userinfo->away_len = tlv->length;
 	}
@@ -1257,7 +1257,7 @@
 	aim_locate_adduserinfo(od, userinfo);
 	userinfo2 = aim_locate_finduserinfo(od, userinfo->sn);
 	aim_info_free(userinfo);
-	free(userinfo);
+	g_free(userinfo);
 
 	/*
 	 * Remove this screen name from our queue.  If the client requested
@@ -1454,7 +1454,7 @@
 		del = od->locate.userinfo;
 		od->locate.userinfo = od->locate.userinfo->next;
 		aim_info_free(del);
-		free(del);
+		g_free(del);
 	}
 }
 
--- a/libpurple/protocols/oscar/family_odir.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_odir.c	Wed May 23 03:09:25 2007 +0000
@@ -190,7 +190,7 @@
 	while (numresults) {
 		struct aim_odir *new;
 		aim_tlvlist_t *tl = aim_tlvlist_readnum(bs, byte_stream_get16(bs));
-		new = (struct aim_odir *)malloc(sizeof(struct aim_odir));
+		new = (struct aim_odir *)g_malloc(sizeof(struct aim_odir));
 		new->first = aim_tlv_getstr(tl, 0x0001, 1);
 		new->last = aim_tlv_getstr(tl, 0x0002, 1);
 		new->middle = aim_tlv_getstr(tl, 0x0003, 1);
@@ -217,21 +217,21 @@
 	while (results) {
 		struct aim_odir *del = results;
 		results = results->next;
-		free(del->first);
-		free(del->last);
-		free(del->middle);
-		free(del->maiden);
-		free(del->email);
-		free(del->country);
-		free(del->state);
-		free(del->city);
-		free(del->sn);
-		free(del->interest);
-		free(del->nick);
-		free(del->zip);
-		free(del->region);
-		free(del->address);
-		free(del);
+		g_free(del->first);
+		g_free(del->last);
+		g_free(del->middle);
+		g_free(del->maiden);
+		g_free(del->email);
+		g_free(del->country);
+		g_free(del->state);
+		g_free(del->city);
+		g_free(del->sn);
+		g_free(del->interest);
+		g_free(del->nick);
+		g_free(del->zip);
+		g_free(del->region);
+		g_free(del->address);
+		g_free(del);
 	}
 
 	return ret;
--- a/libpurple/protocols/oscar/family_oservice.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_oservice.c	Wed May 23 03:09:25 2007 +0000
@@ -194,12 +194,12 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, &redir);
 
-	free((void *)redir.ip);
-	free((void *)redir.cookie);
+	g_free((void *)redir.ip);
+	g_free((void *)redir.cookie);
 
 	if (origsnac)
-		free(origsnac->data);
-	free(origsnac);
+		g_free(origsnac->data);
+	g_free(origsnac);
 
 	aim_tlvlist_free(&tlvlist);
 
@@ -588,7 +588,7 @@
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_BOS);
 	if(!conn)
 		return;
-	
+
 	aim_genericreq_l(od, conn, 0x0001, 0x0011, &idletime);
 }
 
@@ -641,7 +641,7 @@
 		ret = userfunc(od, conn, frame, ip, cktlv ? cktlv->value : NULL);
 
 	aim_tlvlist_free(&tl);
-	free(ip);
+	g_free(ip);
 
 	return ret;
 }
@@ -679,7 +679,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, id, msg);
 
-	free(msg);
+	g_free(msg);
 
 	aim_tlvlist_free(&tlvlist);
 
@@ -769,7 +769,7 @@
 	/* This is frivolous. (Thank you SmarterChild.) */
 	vercount = byte_stream_empty(bs)/4;
 	versions = byte_stream_getraw(bs, byte_stream_empty(bs));
-	free(versions);
+	g_free(versions);
 
 	/*
 	 * Now request rates.
@@ -927,7 +927,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, offset, len, modname);
 
-	free(modname);
+	g_free(modname);
 	aim_tlvlist_free(&list);
 
 	return ret;
@@ -1051,13 +1051,13 @@
 			/* not sure what the difference between 1 and 0 is */
 			guint8 *md5 = byte_stream_getraw(bs, length);
 			ret = userfunc(od, conn, frame, type, flags, length, md5);
-			free(md5);
+			g_free(md5);
 			} break;
 		case 0x0002: { /* available message */
 			/* there is a second length that is just for the message */
 			char *msg = byte_stream_getstr(bs, byte_stream_get16(bs));
 			ret = userfunc(od, conn, frame, msg);
-			free(msg);
+			g_free(msg);
 			} break;
 		}
 	}
--- a/libpurple/protocols/oscar/family_popup.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_popup.c	Wed May 23 03:09:25 2007 +0000
@@ -54,8 +54,8 @@
 		ret = userfunc(od, conn, frame, msg, url, width, height, delay);
 
 	aim_tlvlist_free(&tl);
-	free(msg);
-	free(url);
+	g_free(msg);
+	g_free(url);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/family_userlookup.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/family_userlookup.c	Wed May 23 03:09:25 2007 +0000
@@ -49,8 +49,8 @@
 
 	/* XXX freesnac()? */
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
@@ -107,14 +107,14 @@
 	 */
 	while ((cur = aim_tlv_getstr(tlvlist, 0x0001, j+1)) && j < m)
 	{
-		buf = realloc(buf, (j+1) * (MAXSNLEN+1));
+		buf = g_realloc(buf, (j+1) * (MAXSNLEN+1));
 
 		strncpy(&buf[j * (MAXSNLEN+1)], cur, MAXSNLEN);
-		free(cur);
+		g_free(cur);
 
 		j++;
 	}
-	free(cur);
+	g_free(cur);
 
 	aim_tlvlist_free(&tlvlist);
 
@@ -123,10 +123,10 @@
 
 	/* XXX freesnac()? */
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
-	free(buf);
+	g_free(buf);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/flap_connection.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Wed May 23 03:09:25 2007 +0000
@@ -723,7 +723,7 @@
 
 	aim_tlvlist_free(&tlvlist);
 
-	free(msg);
+	g_free(msg);
 }
 
 /**
--- a/libpurple/protocols/oscar/misc.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/misc.c	Wed May 23 03:09:25 2007 +0000
@@ -128,8 +128,8 @@
 		ret = userfunc(od, conn, frame, error, snac2 ? snac2->data : NULL);
 
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/msgcookie.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/msgcookie.c	Wed May 23 03:09:25 2007 +0000
@@ -113,7 +113,7 @@
 	if (!c)
 		return NULL;
 
-	cookie = calloc(1, sizeof(IcbmCookie));
+	cookie = g_new0(IcbmCookie, 1);
 
 	cookie->data = data;
 	cookie->type = type;
@@ -172,8 +172,8 @@
 			prev = &cur->next;
 	}
 
-	free(cookie->data);
-	free(cookie);
+	g_free(cookie->data);
+	g_free(cookie);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/oft.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/oft.c	Wed May 23 03:09:25 2007 +0000
@@ -568,7 +568,7 @@
 			break;
 	}
 
-	free(frame.name);
+	g_free(frame.name);
 }
 
 /*******************************************************************/
--- a/libpurple/protocols/oscar/rxhandlers.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/rxhandlers.c	Wed May 23 03:09:25 2007 +0000
@@ -55,14 +55,14 @@
 	mod = g_new0(aim_module_t, 1);
 
 	if (modfirst(od, mod) == -1) {
-		free(mod);
+		g_free(mod);
 		return -1;
 	}
 
 	if (aim__findmodule(od, mod->name)) {
 		if (mod->shutdown)
 			mod->shutdown(od, mod);
-		free(mod);
+		g_free(mod);
 		return -1;
 	}
 
@@ -86,7 +86,7 @@
 		if (cur->shutdown)
 			cur->shutdown(od, cur);
 
-		free(cur);
+		g_free(cur);
 
 		cur = tmp;
 	}
--- a/libpurple/protocols/oscar/snac.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/snac.c	Wed May 23 03:09:25 2007 +0000
@@ -57,7 +57,7 @@
 	snac.flags = flags;
 
 	if (datalen) {
-		if (!(snac.data = malloc(datalen)))
+		if (!(snac.data = g_malloc(datalen)))
 			return 0; /* er... */
 		memcpy(snac.data, data, datalen);
 	} else
@@ -78,7 +78,7 @@
 	if (!newsnac)
 		return 0;
 
-	if (!(snac = malloc(sizeof(aim_snac_t))))
+	if (!(snac = g_malloc(sizeof(aim_snac_t))))
 		return 0;
 	memcpy(snac, newsnac, sizeof(aim_snac_t));
 	snac->issuetime = time(NULL);
@@ -109,7 +109,7 @@
 		if (cur->id == id) {
 			*prev = cur->next;
 			if (cur->flags & AIM_SNACFLAGS_DESTRUCTOR) {
-				free(cur->data);
+				g_free(cur->data);
 				cur->data = NULL;
 			}
 			return cur;
@@ -145,8 +145,8 @@
 
 				*prev = cur->next;
 
-				free(cur->data);
-				free(cur);
+				g_free(cur->data);
+				g_free(cur);
 			} else
 				prev = &cur->next;
 		}
--- a/libpurple/protocols/oscar/tlv.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/tlv.c	Wed May 23 03:09:25 2007 +0000
@@ -41,8 +41,8 @@
 	if (!oldtlv || !*oldtlv)
 		return;
 
-	free((*oldtlv)->value);
-	free(*oldtlv);
+	g_free((*oldtlv)->value);
+	g_free(*oldtlv);
 	*oldtlv = NULL;
 
 	return;
@@ -103,7 +103,7 @@
 				cur->tlv->value = byte_stream_getraw(bs, length);
 				if (!cur->tlv->value) {
 					freetlv(&cur->tlv);
-					free(cur);
+					g_free(cur);
 					aim_tlvlist_free(&list);
 					return NULL;
 				}
@@ -159,7 +159,7 @@
 			cur->tlv->value = byte_stream_getraw(bs, length);
 			if (!cur->tlv->value) {
 				freetlv(&cur->tlv);
-				free(cur);
+				g_free(cur);
 				aim_tlvlist_free(&list);
 				return NULL;
 			}
@@ -216,7 +216,7 @@
 			cur->tlv->value = byte_stream_getraw(bs, length);
 			if (!cur->tlv->value) {
 				freetlv(&cur->tlv);
-				free(cur);
+				g_free(cur);
 				aim_tlvlist_free(&list);
 				return NULL;
 			}
@@ -271,8 +271,8 @@
 	aim_tlvlist_write(&bs2, &two);
 
 	if (memcmp(bs1.data, bs2.data, bs1.len)) {
-		free(bs1.data);
-		free(bs2.data);
+		g_free(bs1.data);
+		g_free(bs2.data);
 		return 1;
 	}
 
@@ -304,7 +304,7 @@
 		freetlv(&cur->tlv);
 
 		tmp = cur->next;
-		free(cur);
+		g_free(cur);
 		cur = tmp;
 	}
 
@@ -600,7 +600,7 @@
 	if (cur == NULL)
 		return aim_tlvlist_add_raw(list, type, length, value);
 
-	free(cur->tlv->value);
+	g_free(cur->tlv->value);
 	cur->tlv->length = length;
 	if (cur->tlv->length > 0) {
 		cur->tlv->value = g_memdup(value, length);
@@ -705,9 +705,9 @@
 	}
 
 	/* Free the removed item */
-	free(del->tlv->value);
-	free(del->tlv);
-	free(del);
+	g_free(del->tlv->value);
+	g_free(del->tlv);
+	g_free(del);
 }
 
 /**
@@ -808,7 +808,7 @@
 {
 	char *ret;
 
-	ret = malloc(tlv->length + 1);
+	ret = g_malloc(tlv->length + 1);
 	memcpy(ret, tlv->value, tlv->length);
 	ret[tlv->length] = '\0';
 
--- a/libpurple/protocols/oscar/util.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/protocols/oscar/util.c	Wed May 23 03:09:25 2007 +0000
@@ -101,14 +101,14 @@
 	next = strchr(last, dl);
 
 	if (curCount < theindex) {
-		toReturn = malloc(sizeof(char));
+		toReturn = g_malloc(sizeof(char));
 		*toReturn = '\0';
 	} else {
 		if (next == NULL) {
-			toReturn = malloc((strlen(last) + 1) * sizeof(char));
+			toReturn = g_malloc((strlen(last) + 1) * sizeof(char));
 			strcpy(toReturn, last);
 		} else {
-			toReturn = malloc((next - last + 1) * sizeof(char));
+			toReturn = g_malloc((next - last + 1) * sizeof(char));
 			memcpy(toReturn, last, (next - last));
 			toReturn[next - last] = '\0';
 		}
--- a/libpurple/purple-url-handler	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/purple-url-handler	Wed May 23 03:09:25 2007 +0000
@@ -38,257 +38,6 @@
 
 cpurple = CheckedObject(purple)
 
-def extendlist(list, length, fill):
-    if len(list) < length:
-        return list + [fill] * (length - len(list))
-    else:
-        return list
-
-def convert(value):
-    try:
-        return int(value)
-    except:
-        return value
-
-def findaccount(protocolname, accountname=""):
-    # prefer connected accounts
-    account = cpurple.PurpleAccountsFindConnected(accountname, protocolname)
-    if (account != 0):
-	return account
-
-    # try to get any account and connect it
-    account = cpurple.PurpleAccountsFindAny(accountname, protocolname)
-    if (account == 0):
-        print "No matching account found."
-	sys.exit(1)
-
-    purple.PurpleAccountSetStatusVargs(account, "online", 1)
-    purple.PurpleAccountConnect(account)
-    return account
-
-def goim(account, screenname, message=None):
-    # XXX: 1 == PURPLE_CONV_TYPE_IM
-    conversation = cpurple.PurpleConversationNew(1, account, screenname)
-    if message:
-        purple.PurpleConvSendConfirm(conversation, message)
-
-def gochat(account, params, message=None):
-    connection = cpurple.PurpleAccountGetConnection(account)
-    purple.ServJoinChat(connection, params)
-
-    if message != None:
-    	for i in range(20):
-            # XXX: 2 == PURPLE_CONV_TYPE_CHAT
-            conversation = purple.PurpleFindConversationWithAccount(2, params.get("channel", params.get("room")), account)
-            if conversation:
-                purple.PurpleConvSendConfirm(conversation, message)
-                break
-            else:
-                time.sleep(0.5)
-
-def addbuddy(account, screenname, group="", alias=""):
-    cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
-
-
-def aim(uri):
-    protocol = "prpl-aim"
-    match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
-    if not match:
-        print "Invalid aim URI: %s" % uri
-        return
-
-    command = urllib.unquote_plus(match.group(1))
-    paramstring = match.group(3)
-    params = {}
-    if paramstring:
-        for param in paramstring.split("&"):
-            key, value = extendlist(param.split("=", 1), 2, "")
-            params[key] = urllib.unquote_plus(value)
-    accountname = params.get("account", "")
-    screenname = params.get("screenname", "")
-
-    account = findaccount(protocol, accountname)
-
-    if command.lower() == "goim":
-        goim(account, screenname, params.get("message"))
-    elif command.lower() == "gochat":
-        gochat(account, params)
-    elif command.lower() == "addbuddy":
-        addbuddy(account, screenname, params.get("group", ""))
-
-def gg(uri):
-    protocol = "prpl-gg"
-    match = re.match(r"^gg:(.*)", uri)
-    if not match:
-        print "Invalid gg URI: %s" % uri
-        return
-
-    screenname = urllib.unquote_plus(match.group(1))
-    account = findaccount(protocol)
-    goim(account, screenname)
-
-def icq(uri):
-    protocol = "prpl-icq"
-    match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
-    if not match:
-        print "Invalid icq URI: %s" % uri
-        return
-
-    command = urllib.unquote_plus(match.group(1))
-    paramstring = match.group(3)
-    params = {}
-    if paramstring:
-        for param in paramstring.split("&"):
-            key, value = extendlist(param.split("=", 1), 2, "")
-            params[key] = urllib.unquote_plus(value)
-    accountname = params.get("account", "")
-    screenname = params.get("screenname", "")
-
-    account = findaccount(protocol, accountname)
-
-    if command.lower() == "goim":
-        goim(account, screenname, params.get("message"))
-    elif command.lower() == "gochat":
-        gochat(account, params)
-    elif command.lower() == "addbuddy":
-        addbuddy(account, screenname, params.get("group", ""))
-
-def irc(uri):
-    protocol = "prpl-irc"
-    match = re.match(r"^irc:(//([^/]*)/)?([^?]*)(\?(.*))?", uri)
-    if not match:
-        print "Invalid irc URI: %s" % uri
-        return
-
-    server = urllib.unquote_plus(match.group(2)) or ""
-    target = match.group(3) or ""
-    query = match.group(5) or ""
-
-    modifiers = {}
-    if target:
-        for modifier in target.split(",")[1:]:
-            modifiers[modifier] = True
-
-    isnick = modifiers.has_key("isnick")
-
-    paramstring = match.group(5)
-    params = {}
-    if paramstring:
-        for param in paramstring.split("&"):
-            key, value = extendlist(param.split("=", 1), 2, "")
-            params[key] = urllib.unquote_plus(value)
-
-    account = findaccount(protocol)
-
-    if (target != ""):
-        if (isnick):
-            goim(account, urllib.unquote_plus(target.split(",")[0]), params.get("msg"))
-	else:
-            channel = urllib.unquote_plus(target.split(",")[0])
-            if channel[0] != "#":
-                channel = "#" + channel
-            gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
-
-def msnim(uri):
-    protocol = "prpl-msn"
-    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
-    if not match:
-        print "Invalid msnim URI: %s" % uri
-        return
-
-    command = urllib.unquote_plus(match.group(1))
-    paramstring = match.group(3)
-    params = {}
-    if paramstring:
-        for param in paramstring.split("&"):
-            key, value = extendlist(param.split("=", 1), 2, "")
-            params[key] = urllib.unquote_plus(value)
-    screenname = params.get("contact", "")
-
-    account = findaccount(protocol)
-
-    if command.lower() == "chat":
-        goim(account, screenname)
-    elif command.lower() == "add":
-        addbuddy(account, screenname)
-
-def sip(uri):
-    protocol = "prpl-simple"
-    match = re.match(r"^sip:(.*)", uri)
-    if not match:
-        print "Invalid sip URI: %s" % uri
-        return
-
-    screenname = urllib.unquote_plus(match.group(1))
-    account = findaccount(protocol)
-    goim(account, screenname)
-
-def xmpp(uri):
-    protocol = "prpl-jabber"
-    match = re.match(r"^xmpp:(//([^/?#]*)/?)?([^?#]*)(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri)
-    if not match:
-        print "Invalid xmpp URI: %s" % uri
-        return
-
-    tmp = match.group(2)
-    if (tmp):
-        accountname = urllib.unquote_plus(tmp)
-    else:
-        accountname = ""
-
-    screenname = urllib.unquote_plus(match.group(3))
-
-    tmp = match.group(5)
-    if (tmp):
-        command = urllib.unquote_plus(tmp)
-    else:
-        command = ""
-
-    paramstring = match.group(7)
-    params = {}
-    if paramstring:
-        for param in paramstring.split(";"):
-            key, value = extendlist(param.split("=", 1), 2, "")
-            params[key] = urllib.unquote_plus(value)
-
-    account = findaccount(protocol, accountname)
-
-    if command.lower() == "message":
-        goim(account, screenname, params.get("body"))
-    elif command.lower() == "join":
-        room, server = screenname.split("@")
-        gochat(account, {"room": room, "server": server})
-    elif command.lower() == "roster":
-        addbuddy(account, screenname, params.get("group", ""), params.get("name", ""))
-    else:
-        goim(account, screenname)
-
-def ymsgr(uri):
-    protocol = "prpl-yahoo"
-    match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
-    if not match:
-        print "Invalid ymsgr URI: %s" % uri
-        return
-
-    command = urllib.unquote_plus(match.group(1))
-    screenname = urllib.unquote_plus(match.group(3))
-    paramstring = match.group(5)
-    params = {}
-    if paramstring:
-        for param in paramstring.split("&"):
-            key, value = extendlist(param.split("=", 1), 2, "")
-            params[key] = urllib.unquote_plus(value)
-
-    account = findaccount(protocol)
-
-    if command.lower() == "sendim":
-        goim(account, screenname, params.get("m"))
-    elif command.lower() == "chat":
-        gochat(account, {"room": screenname})
-    elif command.lower() == "addfriend":
-        addbuddy(account, screenname)
-
-
 def main(argv=sys.argv):
     if len(argv) != 2:
         print "Usage: %s URI" % argv[0]
@@ -296,27 +45,10 @@
         return
 
     uri = argv[1]
-    type = uri.split(":")[0]
 
+    print uri
     try:
-        if type == "aim":
-            aim(uri)
-        elif type == "gg":
-            gg(uri)
-        elif type == "icq":
-            icq(uri)
-        elif type == "irc":
-            irc(uri)
-        elif type == "msnim":
-            msnim(uri)
-        elif type == "sip":
-            sip(uri)
-        elif type == "xmpp":
-            xmpp(uri)
-        elif type == "ymsgr":
-            ymsgr(uri)
-        else:
-            print "Unkown protocol: %s" % type
+        cpurple.PurpleGotProtocolHandlerUri(uri)
     except dbus.dbus_bindings.DBusException:
         print "ERROR: Is there a libpurple-powered client (e.g. Pidgin or Finch) running?"
 
--- a/libpurple/util.c	Tue May 22 12:55:56 2007 +0000
+++ b/libpurple/util.c	Wed May 23 03:09:25 2007 +0000
@@ -3159,10 +3159,13 @@
 					keyend = tmp;
 
 				if (keyend && keyend != pairstart) {
+					char *p;
 					key = g_strndup(pairstart, (keyend - pairstart));
 					/* If there is an explicit value */
 					if (keyend != tmp && keyend != (tmp - 1))
 						value = g_strndup(keyend + 1, (tmp - keyend - 1));
+					for (p = key; *p; ++p)
+						*p = g_ascii_tolower(*p);
 					g_hash_table_insert(params, key, value);
 				}
 				keyend = value = NULL;
--- a/pidgin/gtkdialogs.c	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/gtkdialogs.c	Wed May 23 03:09:25 2007 +0000
@@ -378,13 +378,8 @@
 
 	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
 					PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>");
-#ifdef _WIN32
-	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
-						   "#pidgin-win32 on irc.freenode.net<BR><BR>"));
-#else
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
 						   "#pidgin on irc.freenode.net<BR><BR>"));
-#endif
 
 	/* Current Developers */
 	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
--- a/pidgin/gtkimhtml.c	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed May 23 03:09:25 2007 +0000
@@ -932,52 +932,41 @@
 static void copy_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)
 {
 	GtkTextIter start, end;
-	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
-	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
-
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
-
-	gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
-				     selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
-				     (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
-				     (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
-
-	if (imhtml->clipboard_html_string) {
+	if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
+		gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
+						 selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
+						 (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
+						 (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
+
 		g_free(imhtml->clipboard_html_string);
 		g_free(imhtml->clipboard_text_string);
+
+		imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
+		imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
 	}
 
-	imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
-	imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
-
 	g_signal_stop_emission_by_name(imhtml, "copy-clipboard");
 }
 
 static void cut_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)
 {
 	GtkTextIter start, end;
-	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
-	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
-
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
-
-	gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
-				     selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
-				     (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
-				     (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
-
-	if (imhtml->clipboard_html_string) {
+	if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
+		gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
+						 selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
+						 (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
+						 (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
+
 		g_free(imhtml->clipboard_html_string);
 		g_free(imhtml->clipboard_text_string);
+
+		imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
+		imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
+
+		if (imhtml->editable)
+			gtk_text_buffer_delete_selection(imhtml->text_buffer, FALSE, FALSE);
 	}
 
-	imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
-	imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
-
-	if (imhtml->editable)
-		gtk_text_buffer_delete_selection(imhtml->text_buffer, FALSE, FALSE);
 	g_signal_stop_emission_by_name(imhtml, "cut-clipboard");
 }
 
--- a/pidgin/gtkprefs.c	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/gtkprefs.c	Wed May 23 03:09:25 2007 +0000
@@ -1602,6 +1602,7 @@
 #ifdef USE_GSTREAMER
 			_("Automatic"), "automatic",
 			"ESD", "esd",
+			"ALSA", "alsa",
 #endif
 			_("Command"), "custom",
 			_("No sounds"), "none",
--- a/pidgin/gtksound.c	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/gtksound.c	Wed May 23 03:09:25 2007 +0000
@@ -466,6 +466,12 @@
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
+	} else if (!strcmp(method, "alsa")) {
+		sink = gst_element_factory_make("alsasink", "sink");
+		if (!sink) {
+			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
+			return;
+		}
 	} else {
 		purple_debug_error("sound", "Unknown sound method '%s'\n", method);
 		return;
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed May 23 03:09:25 2007 +0000
@@ -519,8 +519,7 @@
   SectionEnd
   Section $(PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE) SecStartMenuShortcut
     SetOverwrite on
-    CreateDirectory "$SMPROGRAMS\Pidgin"
-    CreateShortCut "$SMPROGRAMS\Pidgin\Pidgin.lnk" "$INSTDIR\pidgin.exe"
+    CreateShortCut "$SMPROGRAMS\Pidgin.lnk" "$INSTDIR\pidgin.exe"
     SetOverwrite off
   SectionEnd
 SectionGroupEnd
@@ -750,7 +749,6 @@
     RMDir "$INSTDIR"
 
     ; Shortcuts..
-    RMDir /r "$SMPROGRAMS\Pidgin"
     Delete "$DESKTOP\Pidgin.lnk"
 
     Goto done
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Wed May 23 03:09:25 2007 +0000
@@ -27,8 +27,8 @@
 !define GTK_SECTION_DESCRIPTION			"A Pidgin ltal hasznlt tbbplatformos grafikus eszkzkszlet"
 
 !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Pidgin indtshoz"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Parancsikon ltrehozsa a Pidginhoz az asztalon"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Start Men bejegyzs ltrehozsa a Pidginhoz"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Parancsikon ltrehozsa a Pidginhez az asztalon"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Start Men bejegyzs ltrehozsa a Pidginhez"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Egy rgi verzij GTK+ futtatkrnyezet van teleptve. Kvnja frissteni?$\rMegjegyzs: a Pidgin nem fog mkdni, ha nem frissti."
@@ -46,6 +46,8 @@
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtatkrnyezet teleptse kzben."
 !define GTK_BAD_INSTALL_PATH			"A megadott elrsi t nem rhet el, vagy nem hozhat ltre."
 
+!define URI_HANDLERS_SECTION_TITLE		"URI kezelk"
+
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Az eltvolt nem tallta a Pidgin registry bejegyzseket.$\rValsznleg egy msik felhasznl teleptette az alkalmazst."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nincs jogosultsga az alkalmazs eltvoltshoz."
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Tue May 22 12:55:56 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed May 23 03:09:25 2007 +0000
@@ -7,13 +7,13 @@
 ;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
 ;;  Minor updates: Ambrose C. Li <acli@ada.dhs.org>
 ;;
-;;  Last Updated: July 5, 2005
+;;  Last Updated: May 21, 2007
 ;;
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"w˵{b椤C"
 !define PIDGIN_IS_RUNNING				"Pidgin b椤AХoӵ{AwˡC"
-!define GTK_INSTALLER_NEEDED			"䤣ŦX GTK+ ҩάOݭnQsC$\rЦw v${GTK_MIN_VERSION} HW GTK+ ҡC"
+!define GTK_INSTALLER_NEEDED			"䤣ŦX GTK+ ҩάOݭnQsC$\rЦw v${GTK_MIN_VERSION} ΥHW GTK+ ҡC"
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"U@B >"
@@ -34,17 +34,52 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"o{@ª GTK+ ҡCznNɯŶܡH$\rЪ`NGpGzɯšA $(^Name) iLkTQC"
+!define GTK_WINDOWS_INCOMPATIBLE		"۪ 2.8.0 }lAGTK P Windows 95/98/Me wAۮeAGTK+ ${GTK_INSTALL_VERSION} ]N|QwˡC$\rpGtΤwgw˪ GTK+ ${GTK_MIN_VERSION} ΧsAw˵{NHYC"
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"X Windows Pidgin "
 
 ; Pidgin Section Prompts and Texts
 !define PIDGIN_UNINSTALL_DESC			"$(^Name) (uѲ)"
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Lkثeww˪ PidginAsNbgªpUiwˡC"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"w GTK+ ҮɵoͿ~C"
 !define GTK_BAD_INSTALL_PATH			"zҿJw˥ؿLksΫإߡC"
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI Bz{"
+
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"{Lk Pidgin w˸TC$\roӬOLϥΪ̭swˤFoӵ{C"
-!define un.PIDGIN_UNINSTALL_ERROR_2		"zثevLk Pidgin C"
+!define un.PIDGIN_UNINSTALL_ERROR_2		"zثevLk PidginC"
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"rˬd\"
+!define PIDGIN_SPELLCHECK_ERROR			"w˫rˬd~oͿ~"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"w˫rˬdΪ~oͿ~"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"rˬd䴩]w˶ںsu^C"
+!define ASPELL_INSTALL_FAILED			"w˥"
+!define PIDGIN_SPELLCHECK_BRETON		"h"
+!define PIDGIN_SPELLCHECK_CATALAN		"["
+!define PIDGIN_SPELLCHECK_CZECH			"J"
+!define PIDGIN_SPELLCHECK_WELSH			"º"
+!define PIDGIN_SPELLCHECK_DANISH		""
+!define PIDGIN_SPELLCHECK_GERMAN		"w"
+!define PIDGIN_SPELLCHECK_GREEK			"þ"
+!define PIDGIN_SPELLCHECK_ENGLISH		"^"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"@ɻy"
+!define PIDGIN_SPELLCHECK_SPANISH		"Z"
+!define PIDGIN_SPELLCHECK_FAROESE		"kùsq"
+!define PIDGIN_SPELLCHECK_FRENCH		"k"
+!define PIDGIN_SPELLCHECK_ITALIAN		"NjQ"
+!define PIDGIN_SPELLCHECK_DUTCH			""
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"¤"
+!define PIDGIN_SPELLCHECK_POLISH		"i"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		""
+!define PIDGIN_SPELLCHECK_ROMANIAN		"ùȤ"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"X"
+!define PIDGIN_SPELLCHECK_SLOVAK		"J"
+!define PIDGIN_SPELLCHECK_SWEDISH		""
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"QJ"
+
--- a/po/ChangeLog	Tue May 22 12:55:56 2007 +0000
+++ b/po/ChangeLog	Wed May 23 03:09:25 2007 +0000
@@ -1,10 +1,15 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.1
+	* Chinese (Hong Kong) translation added (Ambrose C. Li)
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) win32 translation updated (Ambrose C. Li)
 	* Finnish translation updated (Timo Jyrinki)
 	* Hebrew translation updated (Shalom Craimer)
 	* Hebrew win32 translation updated (Shalom Craimer)
+	* Hungarian translation updated (Gabor Kelemen)
+	* Hungarian win32 installer updated (Gabor Kelemen)
 	* Russian translation updated (Dmitry Beloglazov)
 	* Turkish Translation updated (Serdar Soytetir)
 
--- a/po/he.po	Tue May 22 12:55:56 2007 +0000
+++ b/po/he.po	Wed May 23 03:09:25 2007 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-18 00:00-0400\n"
-"PO-Revision-Date: 2007-05-18 01:30+0200\n"
+"POT-Creation-Date: 2007-05-22 00:04-0400\n"
+"PO-Revision-Date: 2007-05-22 09:01+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@
 "ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426 ../finch/gntplugin.c:182 ../finch/gntplugin.c:226
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
 #: ../libpurple/protocols/jabber/buddy.c:1426
 #: ../libpurple/protocols/jabber/chat.c:677
@@ -119,8 +119,8 @@
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
 #: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:764 ../finch/gntblist.c:961
-#: ../finch/gntblist.c:1057 ../finch/gntblist.c:2151 ../finch/gntplugin.c:361
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
 #: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
@@ -138,7 +138,7 @@
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6004
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -154,9 +154,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:468
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1189
@@ -184,7 +184,7 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:361 ../finch/gntpounce.c:462
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
 #: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
@@ -211,7 +211,7 @@
 msgid "Delete"
 msgstr "מחק"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2056 ../finch/gntui.c:76
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
 #: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "חשבונות"
@@ -227,9 +227,9 @@
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "הוסף"
@@ -293,12 +293,12 @@
 msgid "Screen Name"
 msgstr "שם לתצוגה"
 
-#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1205
-#: ../libpurple/protocols/msn/msn.c:1358
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
 #: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:974
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
 #: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
@@ -308,7 +308,7 @@
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1255
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
 #: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
 #: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
@@ -316,7 +316,7 @@
 msgid "Account"
 msgstr "חשבון"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:813
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
 #: ../libpurple/protocols/silc/buddy.c:737
 #: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/buddy.c:1080
@@ -336,8 +336,8 @@
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1596
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -345,7 +345,7 @@
 msgid "Name"
 msgstr "שם"
 
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:815 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "הוסף שיחה"
 
@@ -365,9 +365,9 @@
 msgid "A group with the name already exists."
 msgstr "קבוצה בשם זה כבר קיימת."
 
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:817
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5825
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "הוסף קבוצה"
 
@@ -375,114 +375,114 @@
 msgid "Enter the name of the group"
 msgstr "יש להזין את שם הקבוצה"
 
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "ערוך שיחה"
 
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "יש לעדכן את השדות הנחוצים."
 
-#: ../finch/gntblist.c:764 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../finch/gntblist.c:780
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "הצטרף אוטומטית"
 
-#: ../finch/gntblist.c:789
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "ערוך הגדרות"
 
-#: ../finch/gntblist.c:827 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
 #: ../pidgin/gtkconv.c:677
 msgid "Information"
 msgstr "מידע"
 
-#: ../finch/gntblist.c:827 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
 #: ../pidgin/gtkconv.c:677
 msgid "Retrieving..."
 msgstr "שולף..."
 
-#: ../finch/gntblist.c:860 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
 #: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "הצג פרטים"
 
-#: ../finch/gntblist.c:864
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "הוסף תגובה לפעולת איש קשר"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:871 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
 #: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1587
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "שלח קובץ"
 
-#: ../finch/gntblist.c:875
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "הצג רישום"
 
-#: ../finch/gntblist.c:956
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "אנא הזן את השם חדש עבור %s"
 
-#: ../finch/gntblist.c:958 ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "שנה שם"
 
-#: ../finch/gntblist.c:958
+#: ../finch/gntblist.c:962
 msgid "Set Alias"
 msgstr "קבע שם"
 
-#: ../finch/gntblist.c:959
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "הזנת מחרוזת ריקה תאפס את השם."
 
-#: ../finch/gntblist.c:1035
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "הסרת איש-קשר זה תסיר את על החברים באיש הקשר"
 
-#: ../finch/gntblist.c:1043
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "הסרת קבוצה זו גם תסיר את כל החברים בקבוצה"
 
-#: ../finch/gntblist.c:1048
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "האם אתה בטוח שברצונך להסיר את %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1051
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "אשר הסרה"
 
-#: ../finch/gntblist.c:1056 ../finch/gntblist.c:1207 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1636
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
 #: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "הסר"
 
 #. Buddy List
-#: ../finch/gntblist.c:1181 ../finch/gntblist.c:2228 ../finch/gntprefs.c:240
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
 #: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "רשימת אנשי קשר"
 
-#: ../finch/gntblist.c:1212
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "המקום סומן"
 
-#: ../finch/gntblist.c:1217
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "החלף סימון"
 
 #. General
-#: ../finch/gntblist.c:1250 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
@@ -490,7 +490,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1589
 #: ../libpurple/protocols/jabber/buddy.c:1771
 #: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1366 ../libpurple/protocols/msn/msn.c:1534
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
@@ -501,7 +501,7 @@
 msgstr "כינוי"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1270 ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
@@ -514,7 +514,7 @@
 msgid "Idle"
 msgstr "חוסר פעילות"
 
-#: ../finch/gntblist.c:1359
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -523,12 +523,12 @@
 "מחוברים: %d\n"
 "סה\"כ: %d"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "חשבון: %s (%s)"
 
-#: ../finch/gntblist.c:1380
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -537,41 +537,41 @@
 "\n"
 "נראה לאחרונה: לפני %s"
 
-#: ../finch/gntblist.c:1645 ../pidgin/gtkdocklet.c:470
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "חדש..."
 
-#: ../finch/gntblist.c:1652 ../pidgin/gtkdocklet.c:471
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "שמור..."
 
-#: ../finch/gntblist.c:2024 ../finch/gntplugin.c:245 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../finch/gntblist.c:2132 ../pidgin/gtkdialogs.c:706
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
 #: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "שם_"
 
-#: ../finch/gntblist.c:2137 ../pidgin/gtkdialogs.c:711
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
 #: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr " חשבון"
 
-#: ../finch/gntblist.c:2145 ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "הודעה מידית חדשה"
 
-#: ../finch/gntblist.c:2147 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "נא הזן את שם הנמען אליו ברצונך לשלוח הודעה."
 
-#: ../finch/gntblist.c:2150 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
 #: ../libpurple/account.c:983 ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
@@ -579,7 +579,7 @@
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6003
 #: ../libpurple/protocols/silc/buddy.c:467
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc/chat.c:425
@@ -597,27 +597,27 @@
 msgstr "אישור"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2170 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "שמור..."
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2184
 msgid "Show offline buddies"
 msgstr "הצג חברים מנותקים"
 
-#: ../finch/gntblist.c:2186
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "מיין לפי מצב"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "מיין אלפבתית"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "מיין לפי גודל יומן השיחות"
 
@@ -730,15 +730,15 @@
 msgid "List of users:\n"
 msgstr "רשימת משתמשים:\n"
 
-#: ../finch/gntconv.c:842 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "אפשרויות ניפוי הבאגים הנתמכות הן:  version"
 
-#: ../finch/gntconv.c:877 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "אין פקודה כזו (בהקשר הזה)."
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -746,55 +746,55 @@
 "התשמש ב-\"help &lt;פקודה&gt;\" לקבלת עזרה על פקודה ספציפית.\n"
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"
 
-#: ../finch/gntconv.c:938 ../pidgin/gtkconv.c:7073
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."
 
-#: ../finch/gntconv.c:941 ../pidgin/gtkconv.c:7076
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."
 
-#: ../finch/gntconv.c:944 ../pidgin/gtkconv.c:7079
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."
 
-#: ../finch/gntconv.c:947 ../pidgin/gtkconv.c:7082
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: נקה את תוכן חלון השיחה."
 
-#: ../finch/gntconv.c:950 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  עזרה על פקודה ספציפית."
 
-#: ../finch/gntconv.c:953
+#: ../finch/gntconv.c:958
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  הצג את רשימת המשתמשים בצ'אט."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: : הצג את חלון התוספים."
 
-#: ../finch/gntconv.c:961
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: הצג את רשימת החברים."
 
-#: ../finch/gntconv.c:964
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: הצג את חלון החשבונות."
 
-#: ../finch/gntconv.c:967
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: הצג את חלון ניפוי הבאגים."
 
-#: ../finch/gntconv.c:970
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: הצג את חלון ההעדפות."
 
-#: ../finch/gntconv.c:973
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."
 
@@ -885,8 +885,8 @@
 msgstr "עצור"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:206
-#: ../finch/gntplugin.c:292 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
 #: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
 #: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
@@ -959,11 +959,11 @@
 msgid "Continue"
 msgstr "המשך"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1615 ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "מידע"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1576
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "הודעה"
 
@@ -979,7 +979,19 @@
 msgid "(none)"
 msgstr "(ללא)"
 
-#: ../finch/gntplugin.c:125
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "שגיאה"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "טעינת התוסף נכשלה"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "כיבוי התוסף נכשל"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -996,23 +1008,23 @@
 "אתר: %s\n"
 "קובץ: %s\n"
 
-#: ../finch/gntplugin.c:183
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "על התוסף להיות טעון לפני שניתן לשנות לו הגדרות."
 
-#: ../finch/gntplugin.c:227
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "אין אפשרויות הגדרה לתוסף זה."
 
-#: ../finch/gntplugin.c:250
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "ניתן לטעון ולהשעות תוספים מן הרשימה שלהלן."
 
-#: ../finch/gntplugin.c:297
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "הגדר את התוסף"
 
-#: ../finch/gntplugin.c:353 ../finch/gntplugin.c:360 ../finch/gntprefs.c:245
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
 #: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "העדפות"
@@ -1185,6 +1197,10 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "אירעה פעילות לא מוכרת. אנא דווח על כך!"
 
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "על-פי פעילות מקלדת"
+
 #: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "מזמן שליחת ההודעה האחרונה"
@@ -1290,12 +1306,12 @@
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1304,7 +1320,7 @@
 #: ../libpurple/protocols/simple/simple.c:246
 #: ../libpurple/protocols/yahoo/yahoo.c:3477
 #: ../libpurple/protocols/yahoo/yahoo.c:3483
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "הודעה"
@@ -1373,64 +1389,64 @@
 "X, if possible."
 msgstr "כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s כרגע התחבר"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s כרגע התנתק"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s שלך לך הודעה"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s אמר את השם-כינוי שלך בתוך %s"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s שלך לך הודעה בתוך %s"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "איש קשר מתחבר/מתנתק"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "את/ה מקבל/ת הודעה מיידית"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "מישהו מדבר בשיחה"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "מישהו מזכיר את שמך בשיחה"
 
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "התרעה עם טוסטר כאשר"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "גם צפצף!"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "קבע כדחוף בחלון הטרמינל"
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "תוסף טוסטר"
 
@@ -2023,8 +2039,8 @@
 #: ../libpurple/log.c:1251
 #, c-format
 msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> "
-"%s<br/>\n"
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
 "אוטומטי&gt;:</b></font> %s<br/>\n"
@@ -2032,11 +2048,11 @@
 #: ../libpurple/log.c:1253
 #, c-format
 msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> "
-"<b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> "
-"<b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
+"אוטומטי&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
@@ -2139,10 +2155,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1440
 #: ../libpurple/protocols/oscar/oscar.c:2231
 #: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "ביטול"
@@ -2184,8 +2200,8 @@
 "הצג התרעה לאחר שהעברת קובץ שאושר אוטומטית הסתיימה\n"
 "(רק כאשר אין שיחה עם השולח)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "הערות"
 
@@ -2882,8 +2898,8 @@
 #: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4496
-#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/yahoo/yahoo.c:3380
 #: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
@@ -3088,7 +3104,7 @@
 msgid "Year of birth"
 msgstr "שנת לידה"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
 #: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
@@ -3172,7 +3188,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
 #: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
@@ -3418,7 +3434,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1671
 #: ../libpurple/protocols/yahoo/yahoo.c:2745
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "מתחבר"
 
@@ -3487,10 +3503,10 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2129
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:1850
@@ -3499,10 +3515,10 @@
 msgstr "שרת"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2134
-#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
@@ -4102,7 +4118,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1606
 #: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "יום הולדת"
@@ -4211,7 +4227,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1438
 #: ../libpurple/protocols/jabber/jabber.c:1284
 #: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/oscar/oscar.c:5718
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
@@ -4277,7 +4293,7 @@
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
@@ -4300,7 +4316,7 @@
 msgstr "חפש בספרייה"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_חדר:"
@@ -4496,7 +4512,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
@@ -4553,14 +4569,14 @@
 msgstr "הזן את הסיסמה החדשה שלך."
 
 #: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "קבע את המידע על המשתמש..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/oscar/oscar.c:6309
 #: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "שנה סיסמא..."
@@ -5342,38 +5358,38 @@
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "אפשר/בטל הודעות למכשירים ניידים..."
 
-#: ../libpurple/protocols/msn/msn.c:625
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "פתח את תיבת הדואר של Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:649
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "שלח למכשיר נייד"
 
-#: ../libpurple/protocols/msn/msn.c:659
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "יז_ום שיחה"
 
-#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
 
-#: ../libpurple/protocols/msn/msn.c:722
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "כשל בהתחברות לשרת"
 
-#: ../libpurple/protocols/msn/msn.c:1457 ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "שגיאה בשליפת הפרופיל"
 
-#: ../libpurple/protocols/msn/msn.c:1528 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "כללי"
 
-#: ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/msn/msn.c:1536
 #: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
@@ -5381,200 +5397,200 @@
 msgid "Age"
 msgstr "גיל"
 
-#: ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "עיסוק"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "מיקום"
 
-#: ../libpurple/protocols/msn/msn.c:1543 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "תחביבים ותחומי עניין"
 
-#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1669
-#: ../libpurple/protocols/msn/msn.c:1675 ../libpurple/protocols/msn/msn.c:1682
-#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "קצת אודותיי"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "חברתי"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "מצב משפחתי"
 
-#: ../libpurple/protocols/msn/msn.c:1569
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "תחומי עניין"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "חיות מחמד"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "עיר המולדת"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "ערי מגורים"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "אופנה"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "הומור"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "מוסיקה"
 
-#: ../libpurple/protocols/msn/msn.c:1576 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "ציטוט אהוב"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "מידע על איש הקשר"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "בן/בת-זוג"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "טלפון בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "טלפון בבית 2"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1601
 #: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "כתובת בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "טלפון נייד"
 
-#: ../libpurple/protocols/msn/msn.c:1602
-msgid "Home Fax"
-msgstr "פקס בבית"
-
 #: ../libpurple/protocols/msn/msn.c:1603
-msgid "Personal E-Mail"
-msgstr "דוא\"ל אישי"
+msgid "Home Fax"
+msgstr "פקס בבית"
 
 #: ../libpurple/protocols/msn/msn.c:1604
+msgid "Personal E-Mail"
+msgstr "דוא\"ל אישי"
+
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "IM אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "יום נישואין"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "תואר"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1626
 #: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "חברה"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "מחלקה"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "מקצוע"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "טלפון בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "טלפון בעבודה 2"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1631
 #: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "כתובת העבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "טלפון נייד בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "ביפר בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "פקס בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1634
-msgid "Work E-Mail"
-msgstr "דוא\"ל בעבודה"
-
 #: ../libpurple/protocols/msn/msn.c:1635
+msgid "Work E-Mail"
+msgstr "דוא\"ל בעבודה"
+
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "IM בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "תאריך תחילה"
 
-#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1712
-#: ../libpurple/protocols/msn/msn.c:1719 ../libpurple/protocols/msn/msn.c:1726
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "דברים מועדפים"
 
-#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "עודכן לאחרונה"
 
-#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "כתובת אתר בית"
 
-#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "המשתמש לא יצר פרופיל ציבורי."
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1805
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5583,13 +5599,13 @@
 "MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או "
 "שהמשתמש קיים אך לא יצר פרופיל ציבורי."
 
-#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים."
 
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL לפרופיל"
@@ -5604,19 +5620,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2102 ../libpurple/protocols/msn/msn.c:2104
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "תוסף פרוטוקול MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2138
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "השתמש בשיטת HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2143
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "הצג סמייליים שלי"
 
-#: ../libpurple/protocols/msn/msn.c:2151
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומת ליבם"
 
@@ -5685,15 +5701,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "השירות אינו זמין כרגע."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "אין אפשרות לשנות את שם הקבוצה"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "אין אפשרות למחוק את הקבוצה"
 
-#: ../libpurple/protocols/msn/notification.c:1304
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5855,127 +5871,127 @@
 msgid "The screen name specified is invalid."
 msgstr "השם שניתן לתצוגה אינו חוקי."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "פרמטרים נחוצים לא הועברו"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "לא ניתן לכתוב לרשת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "לא ניתן לקרוא מהרשת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "שגיאה בתקשורת עם השרת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "ועידה לא נמצאה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "ועידה לא קיימת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "תיקיה עם שם זה כבר קיימת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "לא נתמך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "פג תוקף סיסמתך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "סיסמה לא נכונה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "המשתמש לא נמצא"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "החשבון בוטל"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "השרת לא יכל לגשת לספרייה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "מנהל המערכת שלך ביטל שימוש בפעולה זו"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "השרת לא זמין; יש לנסות מאוחר יותר"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "לא ניתן להוסיף איש קשר לאותה תיקייה פעמיים"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "לא ניתן להוסיף את עצמך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "הארכיון הראשי מוגדר בצורה לא נכונה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "שם משתמש או סיסמה שגויים"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "לא מזהה את השרת עבור המשתמש שהוזן"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "חשבונך הושעה  עקב ריבוי הזנת סיסמאות שגויות"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "לא ניתן להוסיף פעמיים את אותו אדם לשיחה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "מילאת את מיכסת אנשי-הקשר שניתנה לך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "הזנת שם משתמש שגוי"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "שגיאה בעת עידכון הספרייה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "גירסת לא תואמת של הפרוטוקול"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "משתמש זה חסם אותך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "גירסת הניסוי הזו אינה מאפשרת ליותר מ-10 משתמשים להתחבר בו זמנית"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "משתמש זה לא מחובר או שאתה חסום"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "שגיאה לא מוכרת: 0x%X"
@@ -6271,7 +6287,7 @@
 
 #: ../libpurple/protocols/oscar/libicq.c:147
 #: ../libpurple/protocols/yahoo/yahoo.c:4094
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "קידוד"
 
@@ -6443,7 +6459,7 @@
 msgstr "שיחה"
 
 #: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "קבל קובץ"
 
@@ -6516,17 +6532,17 @@
 msgstr "מצלמה"
 
 #: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
 #: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "לא זמין"
 
 #: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "עסוק"
 
@@ -6662,8 +6678,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1439
 #: ../libpurple/protocols/oscar/oscar.c:2230
 #: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "אישור"
 
@@ -6674,8 +6690,8 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC "
-"עד אשר זה יתוקן. אפשר לבדוק ב-%s לעידכונים."
+"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן. אפשר לבדוק ב-%"
+"s לעידכונים."
 
 #: ../libpurple/protocols/oscar/oscar.c:1481
 #: ../libpurple/protocols/oscar/oscar.c:1524
@@ -6714,7 +6730,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2269
 #: ../libpurple/protocols/oscar/oscar.c:2276
 #: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "לא ניתנה סיבה."
@@ -7050,16 +7066,16 @@
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4193
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "הודעת-התמונה לא נשלחה. עליך להיות מחובר/ת בתקשורת ישירה לשלוח תמונות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4438
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות לקבוע את פרופיל ה-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4440
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7068,7 +7084,7 @@
 "ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל "
 "לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4453
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7079,11 +7095,11 @@
 msgstr[0] "עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
 msgstr[1] "עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
 
-#: ../libpurple/protocols/oscar/oscar.c:4458
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "הפרופיל ארוך מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4503
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7094,11 +7110,11 @@
 msgstr[0] "עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
 msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
 
-#: ../libpurple/protocols/oscar/oscar.c:4508
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4577
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7108,17 +7124,17 @@
 "לא ניתן להוסיף את איש הקשר %s מכיוון ששם המשתמש שלו לא חוקי. שמות משתמשים "
 "חייבים להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או רק להכיל מספרים."
 
-#: ../libpurple/protocols/oscar/oscar.c:4579
-#: ../libpurple/protocols/oscar/oscar.c:5002
-#: ../libpurple/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "לא ניתן להוסיף"
 
-#: ../libpurple/protocols/oscar/oscar.c:4683
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "כשלון בשליפת רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4685
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7126,16 +7142,16 @@
 "זמנית לא ניתן לקבל את רשימת אנשי-הקשר שלך משרתי ה-AIM. הרשימה לא אבדה, וככל "
 "הנראה תהייה זמינה בשעות הקרובות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4888
 #: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4894
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
 #: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5076
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "יתומים"
 
-#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7144,12 +7160,12 @@
 "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך, כיוון שיש יותר מדי אנשי קשר "
 "ברשימה. יש להסיר אחד ולנסות שנית."
 
-#: ../libpurple/protocols/oscar/oscar.c:5000
-#: ../libpurple/protocols/oscar/oscar.c:5014
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(ללא שם)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5014
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7159,7 +7175,7 @@
 "לא ניתן להוסיף את %s מסיבה לא ידועה. הסיבה הכי נפוצה היא שהגעת למספר המירבי "
 "המותר של אנשי קשר ברשימתך."
 
-#: ../libpurple/protocols/oscar/oscar.c:5107
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7167,22 +7183,22 @@
 msgstr ""
 "המשתמש %s התיר לך להוסיף אותו לרשימת אנשי הקשר שלך. האם ברצונך להוסיף אותם?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "ההרשאה ניתנה"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "המשתמש %s התיר לך להוסיף אותו לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "ההרשאה ניתנה"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7192,51 +7208,51 @@
 "המשתמש %s דחה את בקשתך להוסיף אותו לרשימת אנשי הקשר שלך מהסיבה להלן:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "ההרשאה נדחית"
 
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "החלפה:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "שם הצ'אט שצויין אינו תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמונות לצ'אטים ב-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "הודעת ריחוק מהמחשב"
 
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(שולף)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "לינק לחנות המוזיקה iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "הערת איש קשר עבור %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "הערת איש קשר:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "בחרת לפתוח בתקשורת ישירה להודעות עם %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7244,63 +7260,63 @@
 "משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  "
 "להמשיך בכל זאת?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "התחבר"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "הצג פרטי AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "הורד הודעת מצב"
 
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "תקשורת ישירה להודעות"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "בקש הרשאה שוב"
 
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "דרוש הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "מכיר-אינטרנט (הפעלה של זה תביא לדואר שלך SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "אפשרויות פרטיות של ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
 msgstr "הפורמט החדש אינו תקני."
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "פירמוט של שם משתמש רק יכולה לשנות אותיות גדולות/קטנות ורווחים."
 
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>אינך מחכה להרשאה</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7308,73 +7324,73 @@
 "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
 "ולבחור \"בקש הרשאה שוב\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6140
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "חפש איש קשר לפי כתובת בדואר האלרקטרוני שלו"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "הקלד את כתובת הדוא\"ל של איש הקשר אותו אתה מחפש."
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "חיפוש"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "קבע את המידע על המשתמש (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "שנה סיסמא (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "הגדרות עקוב-אחרי להודעות (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "קבע אפשרויות פרטיות..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "אשר חשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "הצג את הכתובת הרשומה כרגע"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "שנה את הכתובת הרשומה כרגע..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "הצג את אנשי הקשר שמחכים לאישור"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "חפש איש-קשר עפ\"י מידע"
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "השתמש בקבוצת אנשי קשר אחרונה"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "הצג כמה זמן את/ה ללא פעילות"
 
-#: ../libpurple/protocols/oscar/oscar.c:6587
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8285,7 +8301,7 @@
 msgid "Send TEST Announcement"
 msgstr "שלח הודעת ניסיון"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "כותרת:"
 
@@ -8320,12 +8336,12 @@
 msgstr "תוכנת-לקוח אחרונה"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "שם משתמש"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "מזהה Sametime"
 
@@ -8396,39 +8412,39 @@
 msgid "Synchronize List with Server"
 msgstr "מסנכרן רשימה עם השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "ייבא רשימת Sametime עבור חשבון %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "ייצא רשימת Sametime עבור חשבון %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה קיימת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "קבוצה בשם '%s' כבר קיימת ברשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "אין אפשרות להוסיף את הקבוצה"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "התאמות אפשריות"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "תוצאות מתוך רשימת הכתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8438,26 +8454,26 @@
 "המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר/"
 "י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "בחר ספר כתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה לא נמצאה"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "המזהה '%s' לא תואם לאף קבוצת ספרי הכתובות של Notes בקהילה שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "קבוצה מספר כתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8465,12 +8481,12 @@
 "יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה "
 "וחבריה לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "תוצאות חיפוש עבור %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8480,28 +8496,28 @@
 "המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם "
 "אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
 
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:716
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "לא נמצאו מתאימים"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "המזהה '%s' לא תואם לאף משתמש בקהילת ה-Sametime שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "לא נמצאו מתאימים"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "חיפוש משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8509,32 +8525,32 @@
 "יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב-"
 "Sametimeשלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "חיפוש משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "ייבא רשימת Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "ייצא רשימת Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "הוסף קבוצה מתוך ספר כתובות של Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "חיפוש משתמש..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "אלץ כניסה (מתעלם מהפניות-שרת)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "הסתר זהות לקוח"
 
@@ -9696,7 +9712,7 @@
 msgstr "whois &lt;כינוי משתמש&gt;:  צפה במידע אודות המשתמש"
 
 #: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;כינוי משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש"
 
@@ -10732,80 +10748,80 @@
 msgstr "לא ניתן לשלוח לצ'אט %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "משתמש"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "חבוי או לא מחובר"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>ב-%s מאז %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_מחלקה:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_ישות:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_נמען:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "ניסיון לעשות מנוי על %s,%s,%s נכשל"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;שם כינוי&gt;: איתור משתמש"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;שם כינוי&gt;: איתור משתמש"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: הצטרף לצ'אט חדש"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ישות&gt;: שלח הודעה ל-&lt;הודעה, <i>ישות</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</i>*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10813,7 +10829,7 @@
 "zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,"
 "<i>ישות</i>,<i>נמען</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10821,15 +10837,15 @@
 "zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</"
 "i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;מחלקה&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,אישי,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "הרשם מחדש למנוי"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "שלוף את המנויים מהשרת"
 
@@ -10843,40 +10859,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "תוסף פרוטוקול Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "השתמש ב-tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "פקודת tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "ייצא ל-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "ייצא ל-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "ייבא מ-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "ייבא מ-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "איזור"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "חשיפה"
 
@@ -11019,12 +11035,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "שגיאה בקריאת %s"
 
-#: ../libpurple/util.c:2497
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11032,62 +11048,62 @@
 msgstr ""
 "חלה שגיאה בעת קריאת ה-%s שלך.  הם לא נטענו, ושם הקובץ הישן הוחלף ל-%s~."
 
-#: ../libpurple/util.c:2967
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "מחשב..."
 
-#: ../libpurple/util.c:2970
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "לא ידוע"
 
-#: ../libpurple/util.c:2996
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d שנייה"
 msgstr[1] "%d שניות"
 
-#: ../libpurple/util.c:3008
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d יום"
 msgstr[1] "%d ימים"
 
-#: ../libpurple/util.c:3016
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d שעה"
 msgstr[1] "%s, %d שעות"
 
-#: ../libpurple/util.c:3022
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d שעה"
 msgstr[1] "%d שעות"
 
-#: ../libpurple/util.c:3030
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d דקה"
 msgstr[1] "%s, %d דקות"
 
-#: ../libpurple/util.c:3036
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d דקה"
 msgstr[1] "%d דקות"
 
-#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "לא ניתן להתחבר אל %s"
 
-#: ../libpurple/util.c:3431
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11096,17 +11112,17 @@
 "לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות "
 "משהו מזיק."
 
-#: ../libpurple/util.c:3466
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "שגיאה בקריאה מתוך %s: %s"
 
-#: ../libpurple/util.c:3497
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "שגיאה בכתיבה לתוך %s: %s"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "לא ניתן להתחבר אל %s: %s"
@@ -11362,7 +11378,7 @@
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4523
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11695,7 +11711,7 @@
 msgid "_Edit Account"
 msgstr "_ערוך חשבון"
 
-#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "לא ניתן לבצע פעולות"
 
@@ -11760,7 +11776,7 @@
 msgid "_Message:"
 msgstr "ה_ודעה:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
@@ -11770,166 +11786,166 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>שיחה עם %s>/h1>\n"
 
-#: ../pidgin/gtkconv.c:1019
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "שמור שיחה"
 
-#: ../pidgin/gtkconv.c:1168 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "חפש"
 
-#: ../pidgin/gtkconv.c:1194 ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_חיפוש עבור:"
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."
 
-#: ../pidgin/gtkconv.c:1354
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."
 
-#: ../pidgin/gtkconv.c:1602
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "בטל כל התעלמות"
 
-#: ../pidgin/gtkconv.c:1605
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "התעלם"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "השג את הודעת ההתרחקות"
 
-#: ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "נאמר לאחרונה"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "לא ניתן לשמור את הסמל לדיסק."
 
-#: ../pidgin/gtkconv.c:2546
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "שמירת סמל"
 
-#: ../pidgin/gtkconv.c:2598
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "הנפש"
 
-#: ../pidgin/gtkconv.c:2603
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "הסתר סמל"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "שמירת סמל בשם..."
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "קבע תמונה..."
 
-#: ../pidgin/gtkconv.c:2623
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "הסר תמונה שנקבעה"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2765
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/_שיחה"
 
-#: ../pidgin/gtkconv.c:2767
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/שיחה/הוד_עה חדשה..."
 
-#: ../pidgin/gtkconv.c:2772
-msgid "/Conversation/_Find..."
-msgstr "/שיחה/_חפש..."
-
-#: ../pidgin/gtkconv.c:2774
-msgid "/Conversation/View _Log"
-msgstr "/שיחה/ה_צג יומן שיחות"
-
-#: ../pidgin/gtkconv.c:2775
-msgid "/Conversation/_Save As..."
-msgstr "/שיחה/_שמור בשם..."
-
-#: ../pidgin/gtkconv.c:2777
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/שיחה/נ_קה גלילה לאחור"
-
-#: ../pidgin/gtkconv.c:2781
-msgid "/Conversation/Se_nd File..."
-msgstr "/שיחה/ש_לח קובץ..."
-
-#: ../pidgin/gtkconv.c:2782
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/שיחה/הוסף פ_עולת תגובה..."
-
 #: ../pidgin/gtkconv.c:2784
-msgid "/Conversation/_Get Info"
-msgstr "/שיחה/הצג מידע"
+msgid "/Conversation/_Find..."
+msgstr "/שיחה/_חפש..."
 
 #: ../pidgin/gtkconv.c:2786
-msgid "/Conversation/In_vite..."
-msgstr "/שיחה/הז_מן..."
-
-#: ../pidgin/gtkconv.c:2788
-msgid "/Conversation/M_ore"
-msgstr "/שיחה/_עוד"
-
-#: ../pidgin/gtkconv.c:2792
-msgid "/Conversation/Al_ias..."
-msgstr "/שיחה/כ_ינוי..."
+msgid "/Conversation/View _Log"
+msgstr "/שיחה/ה_צג יומן שיחות"
+
+#: ../pidgin/gtkconv.c:2787
+msgid "/Conversation/_Save As..."
+msgstr "/שיחה/_שמור בשם..."
+
+#: ../pidgin/gtkconv.c:2789
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/שיחה/נ_קה גלילה לאחור"
+
+#: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/שיחה/ש_לח קובץ..."
 
 #: ../pidgin/gtkconv.c:2794
-msgid "/Conversation/_Block..."
-msgstr "/שיחה/חסו_ם..."
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/שיחה/הוסף פ_עולת תגובה..."
 
 #: ../pidgin/gtkconv.c:2796
-msgid "/Conversation/_Unblock..."
-msgstr "/שיחה/הסר חסי_מה..."
+msgid "/Conversation/_Get Info"
+msgstr "/שיחה/הצג מידע"
 
 #: ../pidgin/gtkconv.c:2798
-msgid "/Conversation/_Add..."
-msgstr "/שיחה/הוס_ף"
+msgid "/Conversation/In_vite..."
+msgstr "/שיחה/הז_מן..."
 
 #: ../pidgin/gtkconv.c:2800
+msgid "/Conversation/M_ore"
+msgstr "/שיחה/_עוד"
+
+#: ../pidgin/gtkconv.c:2804
+msgid "/Conversation/Al_ias..."
+msgstr "/שיחה/כ_ינוי..."
+
+#: ../pidgin/gtkconv.c:2806
+msgid "/Conversation/_Block..."
+msgstr "/שיחה/חסו_ם..."
+
+#: ../pidgin/gtkconv.c:2808
+msgid "/Conversation/_Unblock..."
+msgstr "/שיחה/הסר חסי_מה..."
+
+#: ../pidgin/gtkconv.c:2810
+msgid "/Conversation/_Add..."
+msgstr "/שיחה/הוס_ף"
+
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/שיחה/הס_ר..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/שיחה/_סגור"
 
 #. Options
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/_אפשרויות"
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/אפשרויות/אפשר _צלילים"
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/שיחה/עוד"
 
@@ -11938,164 +11954,164 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2935 ../pidgin/gtkconv.c:2967
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/שיחה"
 
-#: ../pidgin/gtkconv.c:2975
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/שיחה/הצג יומן שיחות"
 
-#: ../pidgin/gtkconv.c:2981
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/שיחה/שלח קובץ..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/שיחה/הוסף פעולת תגובה לאירועי איש קשר..."
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/שיחה/הזמן..."
 
-#: ../pidgin/gtkconv.c:3001
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/שיחה/כינוי..."
 
-#: ../pidgin/gtkconv.c:3005
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/שיחה/חסום..."
 
-#: ../pidgin/gtkconv.c:3009
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/שיחה/הסר חסימה..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/שיחה/הוסף..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/שיחה/הסר..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../pidgin/gtkconv.c:3024
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: ../pidgin/gtkconv.c:3037
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../pidgin/gtkconv.c:3040
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../pidgin/gtkconv.c:3043
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../pidgin/gtkconv.c:3127 ../pidgin/gtkconv.c:3169
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
 msgstr "המשתמש כותב כרגע..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
 msgstr "המשתמש כתב משהו ועצר"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3354
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "שלח _אל"
 
-#: ../pidgin/gtkconv.c:4068
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "ש_לח"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4217
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
-#: ../pidgin/gtkconv.c:5409 ../pidgin/gtkconv.c:5530
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "איש %d בחדר זה"
 msgstr[1] "%d אנשים בחדר זה"
 
-#: ../pidgin/gtkconv.c:6096 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "מקליד/ה"
 
-#: ../pidgin/gtkconv.c:6102
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "הפסיק/ה להקליד"
 
-#: ../pidgin/gtkconv.c:6107
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "שם נאמר"
 
-#: ../pidgin/gtkconv.c:6112 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "הודעות שלא נקראו"
 
-#: ../pidgin/gtkconv.c:6117
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "אירוע חדש"
 
-#: ../pidgin/gtkconv.c:7246
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "אשר סגירה"
 
-#: ../pidgin/gtkconv.c:7278
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "יש לך הודעות שלא נקראו. האם ברצונך לסגור את החלון?"
 
-#: ../pidgin/gtkconv.c:7795
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "סגור את שאר הטאבים"
 
-#: ../pidgin/gtkconv.c:7801
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "סגור את כל הטאבים"
 
-#: ../pidgin/gtkconv.c:7809
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "נתק טאב זה"
 
-#: ../pidgin/gtkconv.c:7815
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "סגור טאב זה"
 
-#: ../pidgin/gtkconv.c:8199
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "סגור חלון"
 
-#: ../pidgin/gtkconv.c:8720
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "חלון אחרון שנוצר"
 
-#: ../pidgin/gtkconv.c:8722
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "הפרד בין חלונות של הודעות וצ'אטים"
 
-#: ../pidgin/gtkconv.c:8724 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "חלון חדש"
 
-#: ../pidgin/gtkconv.c:8726
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "לפי קבוצות"
 
-#: ../pidgin/gtkconv.c:8728
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "לפי חשבון"
 
@@ -12314,6 +12330,10 @@
 msgid "Gujarati"
 msgstr "גוג'ראטית"
 
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "קבוצת השפה גוג'ראטית"
+
 #: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "עברית"
@@ -12341,12 +12361,20 @@
 
 #: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
-msgstr "גרמנית"
+msgstr "גאורגנית (גרוזינית)"
+
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "מתרגמי הגרוזינית של אובונטו"
 
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "קאנאדית"
 
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "קבוצת התרגום לקאנאדית"
+
 #: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "קוריאנית"
@@ -12487,8 +12515,8 @@
 "by its contributors.  See the 'COPYRIGHT' file for the complete list of "
 "contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr ""
-"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר "
-"לבצע חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
+"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע "
+"חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
 "GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, QQ ובכולם בו- זמנית. "
 "התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת "
 "הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ "
@@ -13563,6 +13591,11 @@
 msgid "Log all _status changes to system log"
 msgstr "רשום את כל שינויי הסטטוס ליומן המערכת"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "ברירת המחדל))"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "בחירת הצליל"
@@ -14758,38 +14791,30 @@
 msgid "Hyperlink Color"
 msgstr "צבע קישורים"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "גודל המרחיב"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "מפריד אופקי"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "הזנת שיחות"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "יומן שיחות"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "הצופה ביומנים"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "חלון בקשה"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "חלון התרעות"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "מרחיבי גודל כניסה"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "בחירת צבע"
@@ -14811,36 +14836,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "מוטיב קיצור הדרך הטקסטואלי של GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "צבעי ממשק"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "גדלי פריטי ממשק"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "גופנים"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "כלים"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "שמור הגדרות לתוך %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "קרא-מחדש קבצי gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "בקרת מוטיבים של GTK+ בפידג'ין"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "יש לאפשר גישה להגדרות נפוצות של gtkrc"
 
@@ -15238,1805 +15283,3 @@
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "הדלק/כבה חברים שלא מחוברים"
-
-#~ msgid "Timestamps"
-#~ msgstr "חתימת זמן"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Still need to do something about this."
-#~ msgstr "עדיין צריך לעשות משהו בקשר לזה."
-
-#~ msgid "Autoreply"
-#~ msgstr "מענה אוטומטי"
-
-#~ msgid "Autoreply for all the protocols"
-#~ msgstr "מענה אוטומטי לכל הפרוטוקולים"
-
-#~ msgid ""
-#~ "This plugin lets you set autoreply message for any protocol. You can set "
-#~ "the global autoreply message from the Plugin-options dialog. To set some "
-#~ "specific autoreply message for a particular buddy, right click on the "
-#~ "buddy in the buddy-list window. To set autoreply messages for some "
-#~ "account, go to the `Advanced' tab of the Account-edit dialog."
-#~ msgstr ""
-#~ "תוסף זה מאפשר קביעת הודעת מענה אוטומטי לכל פרוטוקול. ניתן לקבוע הודעת "
-#~ "מענה גלובאלית מתוך חלון הגדרות התוספים. לקביעת הודעת מענה עבור איש-קשר "
-#~ "מסויים, יש ללחוץ כפתור ימני על אותו איש קשר בחלון רשימת אנשי הקשר. לקביעת "
-#~ "הודעות מענה עבור חשבון מסויים, יש לגשת לכרטיסיית ה'מתקדם' של חלון עריכת "
-#~ "החשבון."
-
-#~ msgid "Set autoreply message for %s"
-#~ msgstr "קבע הודעת מענה אוטומטי עבור %s"
-
-#~ msgid "Set Autoreply Message"
-#~ msgstr "קבע הודעת מענה אוטומטי"
-
-#~ msgid ""
-#~ "The following message will be sent to the buddy when the buddy sends you "
-#~ "a message and autoreply is enabled."
-#~ msgstr ""
-#~ "ההודעה להלן תישלח אל איש הקשר כאשר הוא שולח הודעה אליך, והמענה האוטומטי "
-#~ "פעיל."
-
-#~ msgid "Set _Autoreply Message"
-#~ msgstr "קבע הודעת מענה אוטומטי"
-
-#~ msgid "Autoreply message"
-#~ msgstr "הודעת מענה אוטומטי"
-
-#~ msgid "Send autoreply messages when"
-#~ msgstr "שלח הודעות מענה אוטומטי כאשר"
-
-#~ msgid "When my account is _away"
-#~ msgstr "כאשר החשבון שלי מרוחק"
-
-#~ msgid "When my account is _idle"
-#~ msgstr "כאשר החשבון שלי חסר פעילות"
-
-#~ msgid "_Default reply"
-#~ msgstr "מענה ברירת מחדל"
-
-#~ msgid "Status message"
-#~ msgstr "הודעת מצב"
-
-#~ msgid "Autoreply with status message"
-#~ msgstr "ענה אוטומטית עם הודעת המצב"
-
-#~ msgid "Always when there is a status message"
-#~ msgstr "תמיד כאשר יש הודעת מצב"
-
-#~ msgid "Only when there's no autoreply message"
-#~ msgstr "רק כאשר אין הודעת מענה אוטומטי"
-
-#~ msgid "Delay between autoreplies"
-#~ msgstr "השהייה בין מענים אוטומטיים"
-
-#~ msgid "_Minimum delay (mins)"
-#~ msgstr "השהייה מינימלית (בדקות)"
-
-#~ msgid "Times to send autoreplies"
-#~ msgstr "פעמים לשלוח מענות אוטומטיים"
-
-#~ msgid "Ma_ximum count"
-#~ msgstr "מירב הפעמים"
-
-#~ msgid ""
-#~ "I am currently not available. Please leave your message, and I will get "
-#~ "back to you as soon as possible."
-#~ msgstr "אינני זמין כרגע. אנא השאר/י לי את הודעתך, ואני אחזור אליך בהקדם."
-
-#~ msgid "Jabber Account"
-#~ msgstr "חשבון Jabber"
-
-#~ msgid "Cannot join %s:"
-#~ msgstr "לא ניתן להצטרף ל %s:"
-
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "השרת לא היה מסוגל לאמת אותך ללא סיסמא"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "חפש משתמשי Jabber"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "זיהוי משתמש Jabber לא תקין"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "הסיסמה שלך שונתה בהצלחה"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "תוסף פרוטוקול Jabber"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "שגיאה בהגבלת מהירות."
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/כלים/תגובות לפעילות אנשי קשר"
-
-#~ msgid "Jabber developer"
-#~ msgstr "מפתח Jabber"
-
-#~ msgid "Slovack"
-#~ msgstr "סלובקית"
-
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/שיחה/הכנס קיש_ור..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/שיחה/הכנס ת_מונה..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/שיחה/הכנס קישור..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/שיחה/הכנס תמונה..."
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim ב- irc.freenode.net<BR><BR>"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because it belongs to an account "
-#~ "which is disabled or offline.  This buddy and the group were not "
-#~ "removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because they belong to accounts "
-#~ "which are currently disabled or offline.  These buddies and the group "
-#~ "were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d איש קשר מהקבוצה %s לא הוסר מכיוון שהחשבון אליו הוא שייך.אנשי לא מחובר. "
-#~ "איש קשר זה והקבוצה לא הוסר.\n"
-#~ msgstr[1] ""
-#~ "%d אנשי קשר מהקבוצה %s לא הוסרו מכיוון שהחשבונות אליהם הם שייכים.אנשי לא "
-#~ "מחוברים. אנשי קשר אלו והקבוצה לא הוסרו.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "הקבוצה לא הוסרה"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "תמיד השתמש בשרת התיווך של AIM/ICQ להעברות קבצים\n"
-#~ "(יותר איטי, אבל לא חושף את כתובתך)"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "הודעת שגיאה מ-SNAC %s\n"
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "שם המשתמש שלך מפורמט כרגע כך:\n"
-#~ "%s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "פורמט חדש לשם המשתמש:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "פרמט את שם המשתמש..."
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC שלח פקודת PAUSE."
-
-#~ msgid "Buzz!!"
-#~ msgstr "באזז!!"
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "אימות רגיל נכשל!"
-
-#~ msgid "Crazychat"
-#~ msgstr "קרייזי-צ'אט"
-
-#~ msgid "Plugin to establish a Crazychat session."
-#~ msgstr "תוסף המאפשר תקשורת קרייזי-צ'אט."
-
-#~ msgid "Network Configuration"
-#~ msgstr "הגדרות רשת"
-
-#~ msgid "TCP port"
-#~ msgstr "יציאת TCP"
-
-#~ msgid "UDP port"
-#~ msgstr "יציאת UDP"
-
-#~ msgid "Feature Calibration"
-#~ msgstr "כיוונון אפשרויות"
-
-#~ msgid "Disabled"
-#~ msgstr "כבוי"
-
-#~ msgid "DBus"
-#~ msgstr "DBus"
-
-#~ msgid "Blink tray icon for unread..."
-#~ msgstr "הבהב את הסמל במגש-המערכת עבור הודעות חדשות..."
-
-#~ msgid "_Instant Messages:"
-#~ msgstr ":מס_רים מיידים"
-
-#~ msgid "C_hat Messages:"
-#~ msgstr "הודעות _צ'אט:"
-
-#~ msgid ""
-#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
-#~ "show the current status of Gaim, allow fast access to commonly used "
-#~ "functions, and to toggle display of the buddy list. Also provides options "
-#~ "to blink for unread messages."
-#~ msgstr ""
-#~ "מציג סמל באזור ההתרעה )לדוגמא: של GNOME, KDE או Windows( שמראה את המצב "
-#~ "הנוכחי, מאפשר גישה מהירה לפעולות הנפוצות ביותר, הצגה/הסתרה של חלון "
-#~ "\"רשימת אנשי קשר\". כמו כן נותן אפשרות לגרום להודעות נכנסות להמתין בתור "
-#~ "עד לחיצה על הסמל באזור ההתרעה."
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr "איש הקשר המסומן לא נמצא ברשימת אנשי הקשר של Evolution."
-
-#~ msgid "Delay"
-#~ msgstr "השהייה"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "סמל איש הקשר:"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Buddy Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>שם נוסף:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>כינוי:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מחובר:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>לא פעיל:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> מנותק"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>תיאור:</b> מפחיד"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> מדהים"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> מקפיץ"
-
-#~ msgid "IM the user"
-#~ msgstr "שלח הודעה מיידית למשתמש זה"
-
-#~ msgid "Ignore the user"
-#~ msgstr "התעלם מהמשתמש"
-
-#~ msgid "Get the user's information"
-#~ msgstr "הצג מידע על המשתמש"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span size=\"larger\" weight=\"bold\">דואר חדש נכנס!</span>\n"
-#~ "%s"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "שלח פקודות \"קו-נטוי\" לא מוכרות כהודעות"
-
-#~ msgid "Tab Options"
-#~ msgstr "הגדרות כרטיסיה"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "השמע צלילים במצב \"לא נמצא\""
-
-#~ msgid "Away / Idle"
-#~ msgstr "ריחוק מהמחשב / חוסר פעילות"
-
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr "לא ניתן להשמיע צליל, מכוון שקובץ \"%s\" לא קיים."
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "לא ניתן להשמיע את הצליל כיוון שלא ניתן להריץ את פקודת ההשמעה שנקבעה: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>הודעה:</b> %s"
-
-#~ msgid "Unable to initiate a new search"
-#~ msgstr "לא ניתן לאתחל חיפוש חדש"
-
-#~ msgid "You have a pending search. Please wait for it to finish."
-#~ msgstr "יש לך חיפוש בפעולה. יש לחכות לסיומו."
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> %s<br>"
-#~ msgstr "<b>%s:</b> %s<br>"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "השרת דורש TLS/SSLלהתחברות.  יש לבחור ב-\"השתמש ב-TLS אם זמין\" בהגדרות "
-#~ "החשבון"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "השתמש ב-TLS במידה וזמין"
-
-#~ msgid "Require TLS"
-#~ msgstr "דרוש TLS"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "המשתמש %s רוצה להוסיף %s לרשימת אנשי הקשר שלו."
-
-#~ msgid "_Authorize"
-#~ msgstr "אשר"
-
-#~ msgid "_Deny"
-#~ msgstr "דחה"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
-
-#~ msgid "MSN Profile"
-#~ msgstr "פרופיל MSN"
-
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "%s<b>כללי</b><br>%s "
-
-#~ msgid "%s<b>Social</b><br>%s"
-#~ msgstr "%s<b>חברתי</b><br>%s "
-
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>אישי</b><br>%s"
-
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>עסקי</b><br>%s"
-
-#~ msgid "<hr><b>Contact Info</b>%s%s"
-#~ msgstr "<hr><b>מידע ליצירת קשר</b>%s%s"
-
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<hr><b>%s:</b> "
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "המשתמש %s (%s) רוצה להוסיף %s לרשימת אנשי הקשר שלו."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "לא ניתן לקרוא כותר מידע מהשרת"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr "לא ניתן לקרוא הודעה מהשרת: %s.  פקודה היא %hd, אורך הוא %hd."
-
-#~ msgid "Unknown server error."
-#~ msgstr "שגיאת שרת לא מוכרת."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "משתמשים: %s, קבצים: %s, גודל: %sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "אין אפשרות להוסיף \"%s\" לרשימת החמים שלך בנאפסטר"
-
-#~ msgid "%s requested your information"
-#~ msgstr "%s ביקש/ה את המידע שלך"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s ביקש PING"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "תוסף פרוטוקול Napster"
-
-#~ msgid "Invalid password"
-#~ msgstr "סיסמא לא תקפה"
-
-#~ msgid "Invalid username or password"
-#~ msgstr "שם המשתמש או הסיסמא שגויים"
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "התחברות ישירה עם %s נסגרה"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "שגיאה בהתחברות ישירה עם %s"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "לא ניתן לפתוח תקשורת ישירה להודעות"
-
-#~ msgid "You have lost your connection to chat room %s."
-#~ msgstr "איבדת את הקשר שלך לחדר הצ'אט %s."
-
-#~ msgid "Chat is currently unavailable"
-#~ msgstr "השיחה אינה זמינה כעת"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
-#~ "Account -> Advanced."
-#~ msgstr ""
-#~ "הזמן המוקצב להעברת הקובץ %s אזל.\n"
-#~ " יש לנסות להפעיל שימוש בשרתי תיווך עבור העברת קבצים תחת חשבונות -> %s -> "
-#~ "ערוך חשבון -> מתקדם."
-
-#~ msgid "Unable to create new connection."
-#~ msgstr "לא ניתן ליצור חיבור חדש."
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "לא ניתן להתחבר לאמת מול שרת תיווך להעברת קבצים."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr "לא ניתן לקבע שקע קשב, או שאין תקשורת עם מתווך ה-AOL."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "המשתמש %s דורש הרשאה לפני שאפשר להוסיפו לרשימת אנשי הקשר. האם ברצונך "
-#~ "לשלוח בקשה לקבלת הרשאה?"
-
-#~ msgid "Request Authorization"
-#~ msgstr "בקש הרשאה"
-
-#~ msgid "_Request Authorization"
-#~ msgstr "בקש הרשאה"
-
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "המשתמש %u רוצה להוסיף את %s לרשימת אנשי הקשר שלו מהסיבה להלן:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "בקשת הרשאה"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>מספר זיהוי:</B> %s<BR><B>מצב:</B> %s<HR>%s "
-
-#~ msgid "Auth host"
-#~ msgstr "שרת הרשאה"
-
-#~ msgid "Auth port"
-#~ msgstr "יציאת הרשאה"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>תומך ב:</b> %s"
-
-#~ msgid "<b>External User</b><br>"
-#~ msgstr "<b>משתמש חיצוני</b><br>"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>שם מלא:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>תומך ב:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>מצב:</b> %s"
-
-#~ msgid "Wrong Password"
-#~ msgstr "סיסמא שגויה"
-
-#~ msgid "TOC host"
-#~ msgstr "שרת TOC"
-
-#~ msgid "TOC port"
-#~ msgstr "יציאת TOC"
-
-#~ msgid "Message (optional) :"
-#~ msgstr "הודעה (לא חובה) :"
-
-#~ msgid "Invalid username."
-#~ msgstr "שם המשתמש שגוי."
-
-#~ msgid "Unable to read"
-#~ msgstr "לא ניתן לקרוא"
-
-#~ msgid "Pager host"
-#~ msgstr "שרת ה-Pager"
-
-#~ msgid "YCHT host"
-#~ msgstr "שרת YCHT"
-
-#~ msgid "YCHT port"
-#~ msgstr "יציאה ל-YCHT"
-
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>כתובת IP:</b> %s<br>"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: שגיאה בעת פתיחת חיבור תקשורת.\n"
-
-#~ msgid "Screen Name:"
-#~ msgstr "שם לתצוגה:"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "שגיאה בהפעלת הפקודה <b>%s</b>: %s"
-
-#~ msgid "Realname"
-#~ msgstr "שם אמיתי"
-
-#~ msgid "Email Address"
-#~ msgstr "כתובת דוא\"ל"
-
-#~ msgid "EMail"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Public Key File"
-#~ msgstr "קובץ מפתח ציבורי"
-
-#~ msgid "Private Key File"
-#~ msgstr "קובץ מפתח פרטי"
-
-#~ msgid "Re-type Passphrase"
-#~ msgstr "רשום סיסמא בשנית"
-
-#~ msgid "%s came back"
-#~ msgstr "%s חזר"
-
-#~ msgid "%s went away"
-#~ msgstr "%s התרחק מהמחשב"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s התנתק."
-
-#~ msgid "Start _Voice Chat"
-#~ msgstr "יזום שיחה _קולית"
-
-#~ msgid "Background color name"
-#~ msgstr "שם צבע הרקע"
-
-#~ msgid "Background color as a string"
-#~ msgstr "צבע הרקע כמחרוזת"
-
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "צבע הרקע כצבע GdkColor"
-
-#~ msgid "Background set"
-#~ msgstr "קביעת רקע"
-
-#~ msgid "Whether this tag affects the background color"
-#~ msgstr "האם תגית זו משפיעה על צבע הרקע"
-
-#~ msgid "ComboBox model"
-#~ msgstr "מודל התיבה המשולבת"
-
-#~ msgid "The model for the combo box"
-#~ msgstr "המודל לתיבה המשולבת"
-
-#~ msgid "Wrap width"
-#~ msgstr "רוחב גלילה"
-
-#~ msgid "Wrap width for layouting the items in a grid"
-#~ msgstr "רוחב גלילה במיקום הפריטים על רשת"
-
-#~ msgid "Row span column"
-#~ msgstr "פריסה על מספר שורות"
-
-#~ msgid "TreeModel column containing the row span values"
-#~ msgstr "עמודת מודל-העץ המכיל את ערכי הפריסה על השורות"
-
-#~ msgid "Column span column"
-#~ msgstr "עמודת הפריסה על עמודות"
-
-#~ msgid "TreeModel column containing the column span values"
-#~ msgstr "עמודת מודל-העץ המכיל את ערכי הפריסה על העמודות"
-
-#~ msgid "Active item"
-#~ msgstr "פריט פעיל"
-
-#~ msgid "The item which is currently active"
-#~ msgstr "הפריט הפעיל"
-
-#~ msgid "Appears as list"
-#~ msgstr "נראה כרשימה"
-
-#~ msgid "Whether combobox dropdowns should look like lists rather than menus"
-#~ msgstr "האם תיבות-משולבות צריכות להיראות כמו רשימות ולא תפריטים"
-
-#~ msgid "Call ended."
-#~ msgstr "השיחה נסתיימה."
-
-#~ msgid "Calling %s"
-#~ msgstr "מתקשר אל %s"
-
-#~ msgid "End Call"
-#~ msgstr "סיים שיחה"
-
-#~ msgid "Receiving call from %s"
-#~ msgstr "מתקבלת שיחה מאת %s"
-
-#~ msgid "Reject Call"
-#~ msgstr "סרב לשיחה"
-
-#~ msgid "Connected to %s"
-#~ msgstr "מחובר אל %s"
-
-#~ msgid "_Mute"
-#~ msgstr "ה_שתק"
-
-#~ msgid "e-Mail"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Use AIM/ICQ proxy server (slower, but usually works)"
-#~ msgstr "השתמש בשרת התיווך של AIM/ICQ )יותר איטי, אבל בד\"כ עובד("
-
-#~ msgid "Join A Chat..."
-#~ msgstr "הצטרף לשיחה..."
-
-#~ msgid "Screenname:"
-#~ msgstr "שם לתצוגה:"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation.\n"
-#~ "\n"
-#~ "The history plugin requires logging be enabled. Logging can be enabled "
-#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
-#~ "and/or chats will activate history for the same conversation type(s)."
-#~ msgstr ""
-#~ "תוסף ההיסטוריה דורש שיומני רישום יהיו פעילים. ניתן לאפשר רישום מתוך כלים -"
-#~ "> העדפות -> רישום.\n"
-#~ "\n"
-#~ "איפשור יומנים להודעות ו/או צ'אטים יפעיל היסטוריה עבור אותם סוגי שיחות."
-
-#~ msgid "Set account idle time"
-#~ msgstr "קבע את זמן חוסר הפעילות של החשבון"
-
-#~ msgid "Unset account idle time"
-#~ msgstr "בטל את זמן חוסר הפעילות של החשבון"
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d נוספים)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr ".(%s) עזב את החדר"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "להוסים לרשימת אנשי הקשר שלך?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "שם נוסף לאיש הקשר..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "שם נוסף לאיש הקשר..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/כלים/פעולות חשבו_ן"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/כלים/_חשבונות"
-
-#~ msgid "Idle "
-#~ msgstr "חוסר פעילות "
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/כלים/פעולות חשבו_ן"
-
-#~ msgid "Active Developers"
-#~ msgstr "מפתחים פעילים"
-
-#~ msgid "Conversation in %s on %s"
-#~ msgstr "שיחה ב-%s על %s"
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">מאת:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">הנדון:</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span size=\"larger\" weight=\"bold\">דואר חדש נכנס!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Pounce Action"
-#~ msgstr "בחר פעולת תגובה"
-
-#~ msgid "_Warn"
-#~ msgstr "ה_זהר"
-
-#~ msgid "Host name"
-#~ msgstr "שם שרת"
-
-#~ msgid "Change password"
-#~ msgstr "שנה סיסמא"
-
-#~ msgid "Jabber ID"
-#~ msgstr "זיהוי Jabber"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "שגיאה בעיבוד אירוע או משוב (%s)."
-
-#~ msgid "Hide IP address"
-#~ msgstr "הסתר כתובת IP"
-
-#~ msgid "Web aware"
-#~ msgstr "מודע רשת"
-
-#~ msgid "Connected to Sametime Community Server"
-#~ msgstr "מחובר לשרת קהילה של Sametime"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>הודעה</b>: %s"
-
-#~ msgid "Add User"
-#~ msgstr "הוסף משתמש"
-
-#~ msgid "Busy Message"
-#~ msgstr "הודעת ריחוק מהמחשב"
-
-#~ msgid "Set Status Messages..."
-#~ msgstr "קבע הודעות מצב..."
-
-#~ msgid "NotesBuddy Encoding"
-#~ msgstr "קידוד NotesBuddy"
-
-#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
-#~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#~ msgid "Hello!"
-#~ msgstr "שלום!"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "הסתר הודעות ניתוק"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "הסתר שגיאות התחברות"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "הסתר חלון החיבור מחדש"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "כאשר מנתקים אותך, מתחבר מחדש עצמאית"
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "השתמש באיש בקשר האחרון התואם"
-
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "איש הקשר עם הניקוד הכי נמוך יהיה בעל העדיפות הראשונה באדם. \n"
-#~ "ערכי ברירת המחדל (מנותק = 4, מרוחק = 2, וחסר פעילות = 1)\n"
-#~ "ישתמשו במה שהיה פעם הסדר המובנה של: פעיל, לא פעיל, מרוחק, מרוחק + לא "
-#~ "פעיל,-מנותק."
-
-#~ msgid "Back"
-#~ msgstr "חזר"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_הסתר הודעות חדשות עד הלחיצה על סמל מגש המערכת"
-
-#~ msgid "Show user details"
-#~ msgstr "הצג פרטי המשתמש"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/כלים/פעולות ת_וספים"
-
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/כלים/_מצבי פעילות"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "השאר את החלון פתוח"
-
-#~ msgid "Show transfer details"
-#~ msgstr "הצג את פרטי ההעברות"
-
-#~ msgid "Expander Size"
-#~ msgstr "גודל המרחיב"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "גודלו של חץ ההרחבה"
-
-#~ msgid "A_way"
-#~ msgstr "_מרוחק מהמחשב"
-
-#~ msgid "_Idle"
-#~ msgstr "לא פעיל"
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "חזר לפעילות"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "_עיון..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "שמור תגובת-פעילות זו לאחר הפעלתה"
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "הסר תגובת פעילות"
-
-#~ msgid "_Sorting:"
-#~ msgstr "ס_דר:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "תצוגת אנשי הקשר"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "הצג עוד פרטים על איש הקשר"
-
-#~ msgid "Gnome Default"
-#~ msgstr "ברירת מחדל של GNOME"
-
-#~ msgid "_Enable system log"
-#~ msgstr "אפשר _כתיבה לקובץ רישום המערכת"
-
-#~ msgid "Log when buddies log in/log _out"
-#~ msgstr "רשום _כניסה/יציאה של אנשי קשר"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "רשום מעבר מ_פעילות לחוסר פעילות ולהיפך של אנשי קשר"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "רשום ריחוק וחזרה למחשב של אנשי קשר"
-
-#~ msgid "Log your own _signons/idleness/awayness"
-#~ msgstr "רשום שינויים ב_סטטוס שלך לריחוק/פעילות/ניתוק"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "שים הודעות חדשות ב_תור כאשר מרוחק מהמחשב"
-
-#~ msgid "Idle _Tracking:"
-#~ msgstr "דיווח _זמן חוסר פעילות"
-
-#~ msgid "X usage"
-#~ msgstr "בשימוש של X"
-
-#~ msgid "Windows usage"
-#~ msgstr "בשימוש החלונות"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "הודעת _ריחוק:"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">נכתב ע\"י:</span>  %s\n"
-#~ "<span weight=\"bold\">אתר:</span>  %s\n"
-#~ "<span weight=\"bold\">שם קובץ:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "סיכום"
-
-#~ msgid "Details"
-#~ msgstr "פרטים"
-
-#~ msgid "Out of the office"
-#~ msgstr "מחוץ למשרד"
-
-#~ msgid "Could't open file"
-#~ msgstr "לא ניתן לפתוח את הקובץ"
-
-#~ msgid "Token Error: Unable to fetch the token.\n"
-#~ msgstr "שגיאת ערך: לא ניתן להשיג את הערך.\n"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "הודעת יציאה"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "לא ניתן לקבוע את הודעת הריחוק מהמחשב של AIM."
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "כנראה ניסית לקבוע הודעת ריחוק מהמחשב לפני שהסתיים תהליך ההתחברות.מצבך "
-#~ "נותר \"נמצא\"; אפשר לנסות שוב אחרי שתהליך ההחברות יסתייים."
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "וודא חתימות על כל ההודעות המיידיות"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "חתום דיגיטלית על כל ההודעות לחדר"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "וודא חתימות על כל ההודעות בחדר"
-
-#~ msgid "Basic Profile"
-#~ msgstr "פרופיל בסיסי"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "מספר ICQ"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "אני מ"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "קביעת מידע הפרופיל שלך ב- Trepia"
-
-#~ msgid "Set Profile"
-#~ msgstr "קבע פרופיל"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "בקר באתר הבית"
-
-#~ msgid "Local Users"
-#~ msgstr "משתמשים מקומיים"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "תוסף פרוטוקול Trepia"
-
-#~ msgid "Stealth"
-#~ msgstr "הסתר"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d הודעה)"
-#~ msgstr[1] "(%d הודעות)"
-
-#~ msgid "(1 message)"
-#~ msgstr "(הודעה 1)"
-
-#~ msgid "Default auto-away"
-#~ msgstr "ברירת מחדל לריחוק אוטומטי"
-
-#~ msgid "Complete words"
-#~ msgstr "השלם מילים"
-
-#~ msgid "Reconnect"
-#~ msgstr "הת_חבר מחדש"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "הסיבה אינה ידועה."
-
-#~ msgid "_Reconnect"
-#~ msgstr "הת_חבר מחדש"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "ברירת מחדל קצת פחות משעממת"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "מידע על איש הקשר %s"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "פרופיל Jabber"
-
-#~ msgid "User Properties"
-#~ msgstr "מאפייני המשתמש"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "פרטי ICQ עבור %s"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "לאחר חיבור מחדש, החזר את מצב הריחוק מהמחשב למצבו לפני הניתוק"
-
-#~ msgid "Mail Server"
-#~ msgstr "שרת הדואר"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d חדש/%d סה\"כ)"
-
-#~ msgid "Check Mail"
-#~ msgstr "בדוק דואר"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "בדוק דואר כל מספר שניות. \n"
-
-#~ msgid "Auto-login"
-#~ msgstr "כניסה אוטומטית"
-
-#~ msgid "Signoff"
-#~ msgstr "נתק"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "לא מחובר ל AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "אין ניתן שם תצוגה."
-
-#~ msgid "No roomname given."
-#~ msgstr "לא ניתן שם החדר."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "כתובת AIM לא חוקית"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "כישלון בעת השמת %s לשקע:\n"
-#~ "%s"
-
-#~ msgid "Remote Control"
-#~ msgstr "שליטה מרוחקת"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "חלון רשימת אנשי הקשר מתיד עליון אף בהיותו עגון"
-
-#~ msgid "Away!"
-#~ msgstr "רחוק מהמחשב!"
-
-#~ msgid "I'm Back!"
-#~ msgstr "חזרתי"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "ההודעה האם אתה בטוח שברצונך למחוק את \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "הסר הודעת ריחוק מהמחשב"
-
-#~ msgid "Set All Away"
-#~ msgstr "קבע מצב התרחקות כללי"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "אין אפשרות לשמור הודעת ריחוק מהמחשב ללא כותרת"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "יש להזין כותרת להודעה, או לבחור ב-'השתמש' להשתמש ללא שמירה."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "אין אפשרות ליצור הודעת ריחוק מהמחשב ריקה"
-
-#~ msgid "New away message"
-#~ msgstr "הודעת התרחקות מהמחשב חדשה"
-
-#~ msgid "Away title: "
-#~ msgstr "כותרת להתרחקות:"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "שגיעה ברשימת אנשי הקשר"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "שימוש בכתובות AIM:\n"
-#~ "לשלוח הודעה לשם משתמש:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "במקרה זה, 'Penguin' הוא שם המשתמש אליו שולחים, וההודעה היא 'hello world'\n"
-#~ "'+' חייב להחליף רווחים.\n"
-#~ "יש לשים לב לשימוש נכון של גרשיים – הסמל '&' במערכות מסויימות \n"
-#~ "לעיתים דורש טיפול מיוחד, אחרת הפקודה תעצר שם.\n"
-#~ "בנוסף, הפקודה שלהלן תפתח חלון שיחה עם אותו משתמש, בלא לשלוח הודעה:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "הצטרפות לצ'אט:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...מצטרף לצא'ט בחדר בשם 'PenguinLounge'.\n"
-#~ "\n"
-#~ "להוסיף איש קשר לרשימת אנשי הקשר:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...שואל אותך האם להוסיף את המשתמש בשם 'Penguin' לרשימה.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "מסמן את כל החשבונות בתור \"מרוחק מהמחשב\" עם הודעת ברירת המחדל.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "קובע את כל החשבונות למצב של לא-מרוחק.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "פחות"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/אנשי קשר/_התנתקות"
-
-#~ msgid "New group name"
-#~ msgstr "תן שם לקבוצה החדשה"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>חשבון:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "הוזהר (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "כלים/מרוחק מהמחשב/"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "שלח הודעה אל איש הקשר שנבחר"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "הצג פרטים עבור איש הקשר שנבחר"
-
-#~ msgid "_Chat"
-#~ msgstr "_שיחה"
-
-#~ msgid "Join a chat room"
-#~ msgstr "הצטרף לחדר השיחה:"
-
-#~ msgid "_Away"
-#~ msgstr "_רחוק מהמחשב"
-
-#~ msgid "Set an away message"
-#~ msgstr "קבע הסבר לריחוק מהמחשב"
-
-#~ msgid "Done."
-#~ msgstr "מוכן."
-
-#~ msgid "Signon: "
-#~ msgstr "מתחבר: "
-
-#~ msgid "Signon"
-#~ msgstr "מתחבר"
-
-#~ msgid "Cancel All"
-#~ msgstr "בטל הכל"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "הורד הודעת ריחוק מהמחשב"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/שיחה/ה_זהר..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/שיחה/הזהר..."
-
-#~ msgid "Warn the user"
-#~ msgstr "הזהר את המשתמש"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "שלח קובץ אל המשתמש"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "הסר את המשתמש מרשימת אנשי הקשר שלך"
-
-#~ msgid "Invite a user"
-#~ msgstr "הזמן משתמש"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/שיחה/_סגור חלון"
-
-#~ msgid "former lead developer"
-#~ msgstr "מפתח מרכזי לשעבר"
-
-#~ msgid "former maintainer"
-#~ msgstr "מתחזק נוכחי"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "אזרביג'נית"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "ולדימירה גיריגינובה וולדמיר (קלאדן) פטרוב"
-
-#~ msgid "Burmese"
-#~ msgstr "בורמית"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "נורבגית"
-
-#~ msgid "Punjabi"
-#~ msgstr "פאנג'בית"
-
-#~ msgid "Ukrainian"
-#~ msgstr "אוקראינית"
-
-#~ msgid "Xhosa"
-#~ msgstr "קוזה"
-
-#~ msgid "Chinese"
-#~ msgstr "סינית"
-
-#~ msgid "_Screen name"
-#~ msgstr "שם _משתמש"
-
-#~ msgid "Warn User"
-#~ msgstr "הזהר את המשתמש"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">להזהיר את %s?</span>\n"
-#~ "\n"
-#~ "זה יעלה את רמת האזהרה של %s, ויינקטו מולו הגבלת מהירות חמורה יותר.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "?הזהר בעילום שם"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>אזהרות בעילום שם הן פחות חמורות.</b>"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "הצג שמות כינוי שקיימים בשרתים אם לא נקבע כינוי"
-
-#~ msgid "Display"
-#~ msgstr "תצוגה"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "הצג חותמות-זמן בצד הודעות"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "התעלם מ_גודל הגופן"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_שלח את פורמט ברירת המחדל שלך עם הודעות יוצאות"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "_שלח הודעה בלחיצת \"Enter\""
-
-#~ msgid "Window Closing"
-#~ msgstr "סגירת החלונות"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_סגור חלון בלחיצת \"ESC\""
-
-#~ msgid "Insertions"
-#~ msgstr "הכנסות"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Ctrl-(B/I/U) משנה פירמוט"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr " הוספת חיוך ב \"Ctrl+מספר\" "
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "הצג לחצים בתור:"
-
-#~ msgid "Text"
-#~ msgstr "טקסט"
-
-#~ msgid "Pictures and text"
-#~ msgstr "טקסט עם תמונות"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "הפ_על את החלון בעת אירועים"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "הצג את רמות א_זהרה"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "אפשר פקודות \"קו-נטוי\""
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "הצג _כינויים בטאבים וכותרות"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "הצג ו_מקד חלון שיחה בעת אירוע"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "הצג ו_מקד חלון צ'אט בעת אירוע"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "השתמש בשמות מרובי-_צבעים בצ'אט"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "מי_קום הלשוניות:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "מיקום חלון שיחה חד_ש:"
-
-#~ msgid "Message Text"
-#~ msgstr "טקסט ההודעות"
-
-#~ msgid "Shortcuts"
-#~ msgstr "קיצורי מקשים"
-
-#~ msgid "Please create an account."
-#~ msgstr "אנא צור חשבון חדש"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>חשבון_:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "חש_בונות"
-
-#~ msgid "P_references"
-#~ msgstr "ה_עדפות"
-
-#~ msgid "_Sign on"
-#~ msgstr "ה_תחבר"
-
-#~ msgid "Available for friends only"
-#~ msgstr "זמין רק לחברים"
-
-#~ msgid "Away for friends only"
-#~ msgstr "מרוחק מהמחשב רק לחברים"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "בלתי נראה רק לחברים"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "אין אפשרות להסיק את שם המארח"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "שגיאה בכתיבת ההודעה אל השקע."
-
-#~ msgid "Authentication failed."
-#~ msgstr "האימות נכשל."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "קוד שגיאה לא מוכר"
-
-#~ msgid "Reading data"
-#~ msgstr "קורא נתונים"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "לחיצת יד המאזן"
-
-#~ msgid "Reading server key"
-#~ msgstr "קורא מפתח של השרת"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "מחליף קוד מפתחות"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "שגיאה קריטית בספריית GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "לא ניתן להתחבר לשרת"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "מחפש את שרת ה GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "מספר-הזיהוי אינו מזהה חוקי ב-Gadu-Gadu"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "את/ה מנסה לשלוח הודעה למספר-זיהוי שאינו מזהה חוקי ב-Gadu-Gadu"
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "לא ניתן לקבל תוצאות החיפוש"
-
-#~ msgid "Sex"
-#~ msgstr "מין:"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "לא ניתן לייבא את רשימת אנשי הקשר מהשרת."
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "רשימת אנשי הקשר הועברה בהצלחה לשרת ה-Gadu-Gadu"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "לא ניתן לייצא את רשימת אנשי הקשר אל שרת ה-Gadu-Gadu"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "רשימת אנשי הקשר נמחקה בהצלחה משרת ה-Gadu-Gadu"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "לא ניתן למחוק את רשימת אנשי הקשר משרת ה-Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "לא ניתן להחליף סיסמא"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "שגיאה בתקשורת עם שרת ה-Gadu-Gadu"
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "לא ניתן לייבא את רשימת אנשי הקשר של Gadu-Gadu"
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "לא ניתן למחוק את רשימת אנשי הקשר של Gadu-Gadu"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "אין אפשרות להיכנס אל הספריה"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "לא ניתן לגשת לפרופיל המשתמש."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "המשתמש %s (%s%s%s%s%s) רוצה ממך הרשאה."
-
-#~ msgid "Send message through server"
-#~ msgstr "שלח הודעה דרך השרת"
-
-#~ msgid "Nick:"
-#~ msgstr "כינוי:"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "העברת הקובץ בוטלה"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "שם משתמש לא חוקי '%s'"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "שגיאה ברשימת החדרים"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "המשתמש %s רוצה להוסיף אותך לרשימת אנשי הקשר שלו."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "נותקת מהשרת, כיוון שהתחברת ממיקום נוסף"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "נותקת כיוון שהתחברת עם משתמש זה במיקום נוסף."
-
-#~ msgid "Not specified"
-#~ msgstr "לא הוגדר"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש מסתיים ברווח."
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "אני עובד ומקווה למשהו להסיח את הדעת -- שלחו הודעות!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "קבע את הודעת הזמינות..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "לא ניתן לעזוב את הערוץ"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "נותקת מהשרת כיוון שהתחברת דרך מחשב נוסף או מכשיר אחר."
-
-#~ msgid "Please enter your password"
-#~ msgstr "הכנס סיסמא:"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s התחבר."
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s הרגע הוזהר ע\"י %s.\n"
-#~ "רמת האזהרה החדשה שלך הינה %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "אדם אלמוני"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s הזמין את %s לחדר הצ'אט %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "סליחה, אבל אני רצתי לשנייה החוצה"
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/שיחה/שנוי _כינוי..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "הצג הודעות על סגירת שיחות"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "השיחה הפכה ללא-פעילה ונותקה בשל חוסר פעילות לאורך זמן."
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "משלוח הקובץ %s בוטל מפאת חוסר פעילות."
-
-#~ msgid "Local Addressbook"
-#~ msgstr "פנקס כתובות מקומי"
-
-#~ msgid "_Preferences"
-#~ msgstr "העדפות"
-
-#~ msgid "Update Buddy Icon"
-#~ msgstr "עדכן את סמל איש הקשר"
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "שגיאה בכתיבה לשרת %s"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "שגיאה בקריאה משרת %s"
-
-#~ msgid "Notification"
-#~ msgstr "הודעה"
-
-#~ msgid "That file does not exist."
-#~ msgstr "הקובץ אינו קיים"
-
-#~ msgid "%s was not found.\n"
-#~ msgstr "%s לא נמצא."
-
-#~ msgid "Userid"
-#~ msgstr "משתמש שם"
-
-#~ msgid "Your message to %s did not get sent:"
-#~ msgstr "ההודעה שלך ל-%s לא נשלחה:"
-
-#~ msgid "boring default"
-#~ msgstr "ברירת המחדל משעממת"
-
-#~ msgid "Buddy icon file:"
-#~ msgstr "קובץ סמל איש הקשר:"
-
-#~ msgid "_Browse"
-#~ msgstr "_עיין"
-
-#~ msgid "_Reset"
-#~ msgstr "_קבע מחדש"
-
-#~ msgid "/Tools/P_rotocol Actions"
-#~ msgstr "/כלים/פעולות של _פרוטוקול"
-
-#~ msgid "That file already exists."
-#~ msgstr "הקובץ כבר קיים"
-
-#~ msgid "Style"
-#~ msgstr "סגנון"
-
-#~ msgid "_Bold"
-#~ msgstr "_מודגש"
-
-#~ msgid "_Underline"
-#~ msgstr "_קו תחתון"
-
-#~ msgid "_Strikethrough"
-#~ msgstr "ק_ו חוצה"
-
-#~ msgid "Face"
-#~ msgstr "סוג"
-
-#~ msgid "Use custo_m face"
-#~ msgstr "השתמש בגופן מותאם אישית"
-
-#~ msgid "Use custom si_ze"
-#~ msgstr "השתמש בגודל מותאם אישית"
-
-#~ msgid "Color"
-#~ msgstr "צבע"
-
-#~ msgid "Bac_kground color"
-#~ msgstr "צבע הרקע"
-
-#~ msgid "Show _URLs as links"
-#~ msgstr "הצג את כתובות אינטרנט בתור קישורים"
-
-#~ msgid "Buddy List Toolbar"
-#~ msgstr "סרגל כלים של רשימת אנשי הקשר"
-
-#~ msgid "Group Display"
-#~ msgstr "תצוגת קבוצות"
-
-#~ msgid "Show _numbers in groups"
-#~ msgstr "מי_ספור הקבוצות"
-
-#~ msgid "Send _URLs as links"
-#~ msgstr "שלח _כתובות אינרנט בתור קישורים"
-
-#~ msgid "Show IMs and chats in _same tabbed window"
-#~ msgstr "הצג שיחות והודעות מיידיות באותו חלון לשוניות"
-
-#~ msgid "Show status _icons on tabs"
-#~ msgstr "הצג סמלי מצב על גבי לשוניות הכרטיסיות"
-
-#~ msgid "Window"
-#~ msgstr "חלון"
-
-#~ msgid "New window _width:"
-#~ msgstr "רוחב החלון:"
-
-#~ msgid "New window _height:"
-#~ msgstr "גובה החלון:"
-
-#~ msgid "_Entry field height:"
-#~ msgstr "גובה חלון הטקסט:"
-
-#~ msgid "Hide window on _send"
-#~ msgstr "הסתר חלון לאחר שליחת ההודעה"
-
-#~ msgid "Buddy Icons"
-#~ msgstr "סמלים אנשי הקשר"
-
-#~ msgid "Typing Notification"
-#~ msgstr "התרעה על הקלדה"
-
-#~ msgid "Tab Completion"
-#~ msgstr "השלמות מילים"
-
-#~ msgid "_Tab-complete nicks"
-#~ msgstr "ה_שלם שמות משתמשים בלחיצת TAB"
-
-#~ msgid "_Show people joining in window"
-#~ msgstr "הצג שמות מ_צטרפים בחלון"
-
-#~ msgid "_Show people leaving in window"
-#~ msgstr "הצג שמות ה_עוזבים בחלון"
-
-#~ msgid "Co_lorize screen names"
-#~ msgstr "צבע שמות משתמשים"
-
-#~ msgid "Sounds when you _log in"
-#~ msgstr "צלילים במהלך הה_תחברות"
-
-#~ msgid "Seconds before _resending:"
-#~ msgstr "_שניות לפני שליחה מחודשת:"
-
-#~ msgid "Protocols"
-#~ msgstr "פרוטוקולים"
-
-#~ msgid "Unable to request USR\n"
-#~ msgstr "לא ניתן לבקש USR\n"
-
-#~ msgid "Unable to send USR"
-#~ msgstr "לא ניתן לשלוח USR\n"
-
-#~ msgid "Unable to request CVR\n"
-#~ msgstr "לא ניתן לבקש CVR\n"
-
-#~ msgid "Unable to request INF\n"
-#~ msgstr "לא ניתן לבקש INF\n"
-
-#~ msgid "Got invalid XFR"
-#~ msgstr "התקבל XFR לא תקף"
-
-#~ msgid "Unable to parse message."
-#~ msgstr "לא ניתן לפענח את ההודעה."
-
-#~ msgid "Unable to write to MSN Nexus server."
-#~ msgstr "לא ניתן לכתוב לשרת ה-MSN Nexus"
-
-#~ msgid "Unable to send password"
-#~ msgstr "לא ניתן לשלוח סיסמא"
-
-#~ msgid "Protocol not supported"
-#~ msgstr "הפרוטוקול אינו נתמך"
-
-#~ msgid "Unable to transfer to notification server"
-#~ msgstr "לא ניתן להעביר אל שרת ההתרעות"
-
-#~ msgid "IO Error."
-#~ msgstr "שגיאת קלט/פלט"
-
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "שם משתמש: <b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "רמת אזהרה: <b>%d%%</b><br>\n"
-
-#~ msgid "Online Since: <b>%s</b><br>\n"
-#~ msgstr "מחובר מאז: <b>%s</b><br>\n"
-
-#~ msgid "Member Since: <b>%s</b><br>\n"
-#~ msgstr "חבר מאז: <b>%s</b><br>\n"
-
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "לא פעיל: <b>%s</b>"
-
-#~ msgid "Idle: <b>Active</b>"
-#~ msgstr "לא פעיל: <b>פעיל</b>"
-
--- a/po/hu.po	Tue May 22 12:55:56 2007 +0000
+++ b/po/hu.po	Wed May 23 03:09:25 2007 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: gaim 2.0-beta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-01 21:06+0200\n"
-"PO-Revision-Date: 2007-05-02 15:49+0200\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-22 13:31+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -45,25 +45,31 @@
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:689
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr "A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://developer.pidgin.im oldalon."
-
-#: ../finch/finch.c:306
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274
+#: ../finch/finch.c:303
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../finch/finch.c:301
+#: ../pidgin/gtkmain.c:685
+#, c-format
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://developer.pidgin.im oldalon."
+
+#: ../finch/gntaccount.c:119
+#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426
+#: ../finch/gntplugin.c:181
+#: ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
 #: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
@@ -77,16 +83,19 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Fiók megjelenő neve nem lehet üres."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423
+#: ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "Értesítések új levélre"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433
+#: ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "Emlékezzen a jelszóra"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
-#: ../pidgin/gtkblist.c:3948
+#: ../finch/gntaccount.c:474
+#: ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "Fiók módosítása"
 
@@ -94,49 +103,71 @@
 msgid "New Account"
 msgstr "Új fiók"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500
+#: ../pidgin/gtkaccount.c:427
+#: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5357
+#: ../finch/gntaccount.c:508
+#: ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Felhasználónév:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5378
-#: ../pidgin/gtkblist.c:5741
+#: ../finch/gntaccount.c:531
+#: ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "Álnév:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../finch/gntaccount.c:554
+#: ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838
+#: ../finch/gntblist.c:332
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:768
+#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061
+#: ../finch/gntblist.c:2155
+#: ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456
+#: ../finch/gntpounce.c:654
+#: ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984
+#: ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/msn/msn.c:259
+#: ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293
+#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -152,9 +183,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:468
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1189
@@ -163,34 +194,54 @@
 #: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
 #: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
-#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5797
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242
+#: ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485
+#: ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725
+#: ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955
+#: ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166
+#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232
+#: ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302
+#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566
+#: ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607
+#: ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Mégsem"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../finch/gntaccount.c:558
+#: ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:478
+#: ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Mentés"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../finch/gntaccount.c:611
+#: ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -201,16 +252,25 @@
 msgstr "Fiók törlése"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../finch/gntaccount.c:616
+#: ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653
+#: ../finch/gntpounce.c:714
+#: ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204
+#: ../pidgin/gtkaccount.c:1893
+#: ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:539
+#: ../finch/gntaccount.c:646
+#: ../finch/gntblist.c:2060
+#: ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311
+#: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Fiókok"
 
@@ -219,50 +279,68 @@
 msgstr "A következő lista fiókjait engedélyezheti/tilthatja le."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:837
+#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436
+#: ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699
+#: ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878
+#: ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkblist.c:5796 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599
+#: ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828
+#: ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:679
+#: ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Módosítás"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
+#: ../finch/gntaccount.c:760
+#: ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s felvette %s partnert %s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
+#: ../finch/gntaccount.c:833
+#: ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "Felveszi a partnert a partnerlistájára?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#: ../finch/gntaccount.c:887
+#: ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../finch/gntaccount.c:907
+#: ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558
+#: ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "Engedélyezi a partnert?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:911
+#: ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559
+#: ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "Engedélyezés"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:912
+#: ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560
+#: ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "Elutasítás"
 
@@ -278,221 +356,289 @@
 msgid "You must select an account."
 msgstr "Ki kell választania egy fiókot."
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "A kiválasztott fiók nem online."
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "Hiba a partner hozzáadásakor"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
-#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:313
+#: ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969
+#: ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Felhasználónév"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../finch/gntblist.c:316
+#: ../finch/gntblist.c:393
+#: ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
 #: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207
+#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Álnév"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:319
+#: ../finch/gntblist.c:396
 msgid "Group"
 msgstr "Csoport"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2946 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323
+#: ../finch/gntblist.c:384
+#: ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171
+#: ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965
+#: ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269
+#: ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Fiók"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:817
 #: ../libpurple/protocols/silc/buddy.c:737
 #: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:3144
+#: ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Partner felvétele"
 
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "Adja meg a partnerinformációkat."
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:356
+#: ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Csevegések"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1616
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../finch/gntblist.c:390
+#: ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532
+#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Név"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5687
+#: ../finch/gntblist.c:399
+#: ../finch/gntblist.c:819
+#: ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "Csevegés hozzáadása"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "Később a helyi menüből további információkat is módosíthat."
 
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "Hiba a csoport hozzáadásakor"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "Meg kell adnia a felvenni kívánt csoport nevét."
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "Ilyen nevű csoport már létezik."
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5793
+#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "Csoport felvétele"
 
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "Adja meg a csoport nevét"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "Csevegés szerkesztése"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "Frissítse a szükséges mezőket."
 
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:768
+#: ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "Automatikus csatlakozás"
 
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "Beállítások szerkesztése"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:831
+#: ../finch/gntconv.c:317
+#: ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "Információk"
+
+#: ../finch/gntblist.c:831
+#: ../finch/gntconv.c:317
+#: ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "Lekérés..."
+
+#: ../finch/gntblist.c:864
+#: ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Információ lekérése"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "Partnerfigyelmeztetés felvétele"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:875
+#: ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636
+#: ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "Napló megtekintése"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Kérem adja meg új  %snevét"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
+#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "Álnév beállítása"
+
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "A név visszaállításához üres karakterláncot adjon meg."
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "A kapcsolat eltávolítása a kapcsolat partnereit is eltávolítja"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "A csoport eltávolítása a csoportban található partnereket is eltávolítja"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Biztos, hogy törölni akarja a következőt: %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "Eltávolítás jóváhagyása"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1060
+#: ../finch/gntblist.c:1211
+#: ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. Buddy List
-#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4190
+#: ../finch/gntblist.c:1185
+#: ../finch/gntblist.c:2232
+#: ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77
+#: ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Partnerlista"
 
-#: ../finch/gntblist.c:1200
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "Hely megcímkézve"
 
-#: ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "Címke átváltása"
 
 #. General
-#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../finch/gntblist.c:1254
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045
+#: ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367
+#: ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2970
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042
+#: ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Becenév"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../finch/gntblist.c:1274
+#: ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516
+#: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2990
-#: ../pidgin/gtkblist.c:3379 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686
+#: ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399
+#: ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "Inaktív"
 
-#: ../finch/gntblist.c:1347
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -501,12 +647,12 @@
 "Elérhető: %d\n"
 "Összesen: %d"
 
-#: ../finch/gntblist.c:1356
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Fiók: %s (%s)"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -515,48 +661,65 @@
 "\n"
 "Utoljára látszott: %s"
 
-#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:487
+#: ../finch/gntblist.c:1649
+#: ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Új..."
 
-#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:488
+#: ../finch/gntblist.c:1656
+#: ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Mentett..."
 
-#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:540 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2028
+#: ../finch/gntplugin.c:244
+#: ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523
+#: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136
+#: ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844
+#: ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "_Név"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141
+#: ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849
+#: ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "_Fiók"
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2149
+#: ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "Új azonnali üzenet"
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2151
+#: ../pidgin/gtkdialogs.c:721
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek üzenni szeretne."
 
-#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../finch/gntblist.c:2154
+#: ../finch/gntconn.c:48
+#: ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983
+#: ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/msn/msn.c:258
+#: ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
 #: ../libpurple/protocols/silc/buddy.c:467
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc/chat.c:425
@@ -565,36 +728,41 @@
 #: ../libpurple/protocols/silc/ops.c:1297
 #: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3947
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241
+#: ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724
+#: ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Rendben"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2174
+#: ../finch/gntpounce.c:444
+#: ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../finch/gntblist.c:2162
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "Üzenet küldése..."
 
-#: ../finch/gntblist.c:2166
-msgid "Toggle offline buddies"
-msgstr "Offline partnerek be/ki"
-
-#: ../finch/gntblist.c:2172
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "Kilépett partnerek megjelenítése"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "Állapot szerint"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "ABC sorrend"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "Naplóméret szerint"
 
@@ -617,57 +785,64 @@
 "%s kapcsolata megszakadt a következő hiba miatt:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3944
+#: ../finch/gntconn.c:45
+#: ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "Kapcsolódási hiba"
 
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3949
+#: ../finch/gntconn.c:49
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Nincs ilyen parancs."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120
+#: ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a "
-"parancsnak."
-
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+msgstr "Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a parancsnak."
+
+#: ../finch/gntconv.c:125
+#: ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "A parancs végrehajtása ismeretlen ok miatt sikertelen."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130
+#: ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "Ez a parancs csak csevegéskor működik, azonnali üzeneteknél nem."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133
+#: ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "Ez a parancs csak azonnali üzeneteknél működik, csevegéskor nem."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137
+#: ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "Ez a parancs nem működik ezzel a protokollal."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "A parancsok még nem támogatottak. Az üzenet NEM lett elküldve."
 
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258
+#: ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -676,85 +851,115 @@
 "\n"
 "%s gépel..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "Elhagyta ezt a csevegést."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Küldés ennek"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Társalgás"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Előzmények törlése"
+
+#: ../finch/gntconv.c:407
+#: ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Időbélyegek"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Partnerfigyelmeztetés felvétele..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATIKUS VÁLASZ> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "Felhasználólista:\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847
+#: ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "A támogatott hibakeresési parancsok:  version"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882
+#: ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "Nincs ilyen parancs (ebben a kontextusban)."
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885
+#: ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának "
-"megtekintéséhez.\n"
+"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának megtekintéséhez.\n"
 "Ebben a kontextusban a következő parancsok állnak rendelkezésre:\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+#: ../finch/gntconv.c:943
+#: ../pidgin/gtkconv.c:7085
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;üzenet&gt;: Üzenet küldése, mintha nem használná a parancsot."
 
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946
+#: ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy "
-"csevegésnek."
-
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a jelenlegi "
-"társalgásba."
-
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+msgstr "me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy csevegésnek."
+
+#: ../finch/gntconv.c:949
+#: ../pidgin/gtkconv.c:7091
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a jelenlegi társalgásba."
+
+#: ../finch/gntconv.c:952
+#: ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Törli a társalgás előzményeit."
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955
+#: ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;parancs&gt;: Egy adott parancs súgója."
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users: A csevegés felhasználólistájának megjelenítése."
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: A bővítmények ablak megjelenítése."
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: A partnerlista megjelenítése."
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: A fiókok ablak megjelenítése."
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: A hibakereső ablak megjelenítése."
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: A beállítások ablak megjelenítése."
 
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: A mentett állapotok ablak megjelenítése."
 
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+#: ../finch/gntdebug.c:230
+#: ../finch/gntui.c:79
+#: ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "Hibakereső ablak"
 
@@ -762,37 +967,46 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251
+#: ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "Törlés"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Szűrő:"
+
+#: ../finch/gntdebug.c:261
+#: ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "Időbélyegek"
-
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:117
+#: ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Fájlátvitelek - %2$d fájl %1$d százaléka"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#: ../finch/gntft.c:122
+#: ../finch/gntft.c:194
+#: ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233
+#: ../pidgin/gtkft.c:763
 msgid "File Transfers"
 msgstr "Fájlátvitel"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Folyamat"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Méret"
 
@@ -800,31 +1014,38 @@
 msgid "Speed"
 msgstr "Sebesség"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Hátralévő"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:197
+#: ../finch/gntstatus.c:537
+#: ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1034
+#: ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2650
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3034
-#: ../pidgin/gtkblist.c:3047 ../pidgin/gtkblist.c:3049
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3049
+#: ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943
+#: ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Állapot"
 
@@ -841,101 +1062,139 @@
 msgstr "Leállítás"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233
+#: ../finch/gntnotify.c:179
+#: ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291
+#: ../finch/gntpounce.c:722
+#: ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375
+#: ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:299
+#: ../pidgin/gtkft.c:168
+#: ../pidgin/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:366
+#: ../pidgin/gtkft.c:165
+#: ../pidgin/gtkft.c:1056
 msgid "Canceled"
 msgstr "Megszakítva"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:368
+#: ../pidgin/gtkft.c:1058
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:414
+#: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/mp"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:425
+#: ../finch/gntft.c:426
+#: ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1118
 msgid "Finished"
 msgstr "Befejeződött"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428
+#: ../libpurple/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Átvitel"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "E-mailek"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168
+#: ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "Levele érkezett!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171
+#: ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "Feladó"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171
+#: ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Tárgy"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) %d új üzenetet kapott."
 msgstr[1] "%s (%s) %d új üzenetet kapott."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222
+#: ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Új e-mail"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287
+#: ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s információi"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "Partnerinformáció"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "Folytatás"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372
+#: ../pidgin/gtkconv.c:1627
+#: ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "Információ"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375
+#: ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Azonnali üzenet"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(nincs)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "HIBA"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "a bővítmény betöltése sikertelen"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "a bővítmény eltávolítása meghiúsult"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -952,36 +1211,43 @@
 "Weboldal: %s\n"
 "Fájlnév: %s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "A bővítményt be kell tölteni, mielőtt beállíthatná."
 
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "A bővítménynek nincsenek beállításai."
 
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "A következő lista bővítményeit töltheti be vagy távolíthatja el."
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "Bővítmény beállítása"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:541 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352
+#: ../finch/gntplugin.c:359
+#: ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkdocklet.c:524
+#: ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180
+#: ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "Adjon meg egy figyelendő partnert."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325
+#: ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "Új partnerfigyelmeztetés"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325
+#: ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "Partnerfigyelmeztetés szerkesztése"
 
@@ -991,8 +1257,10 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5405
-#: ../pidgin/gtkblist.c:5721
+#: ../finch/gntpounce.c:333
+#: ../finch/gntstatus.c:446
+#: ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "Fiók:"
 
@@ -1001,7 +1269,8 @@
 msgstr "Partner neve:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371
+#: ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "Figyelmeztetés, ha a partner..."
 
@@ -1046,7 +1315,8 @@
 msgstr "Üzenetet küld"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411
+#: ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "Művelet"
 
@@ -1074,135 +1344,160 @@
 msgid "Pounce only when my status is not available"
 msgstr "Csak akkor figyelmeztet, ha az állapotom nem érhető el"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:447
+#: ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "Ismétlődő"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649
+#: ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Biztos, hogy törölni akarja %s figyelmeztetését a következőnek: %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:682
+#: ../finch/gntui.c:78
+#: ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "Partnerfigyelmeztetések"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:794
+#: ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s gépelni kezdett Önnek (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:796
+#: ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s szünetet tart az Önnek gépelés közben (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:798
+#: ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s belépett (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:800
+#: ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s inaktív állapota megszűnt (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:802
+#: ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s visszatért (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:804
+#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s abbahagyta a gépelést (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:806
+#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s kilépett (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:808
+#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s állapota inaktív (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:810
+#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s távol van. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:812
+#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s egy üzenetet küldött. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Billentyűzet használata alapján"
+
+#: ../finch/gntprefs.c:81
+#: ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "Utolsó elküldött üzenettől"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../finch/gntprefs.c:83
+#: ../pidgin/gtkprefs.c:820
+#: ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1827
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Soha"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "Inaktivitási idők megjelenítése"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "Kilépett partnerek megjelenítése"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "Időbélyegek"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "Partnerek figyelmeztetése, ha nekik gépel"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "Naplóformátum"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "Üzenetek naplózása"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "Csevegések naplózása"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "Állapotváltozások naplózása"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241
+#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Társalgások"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242
+#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Naplózás"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "Még nincs megvalósítva."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../finch/gntrequest.c:597
+#: ../pidgin/gtkrequest.c:1529
 #: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "Fájl mentése..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../finch/gntrequest.c:597
+#: ../pidgin/gtkrequest.c:1530
 #: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "Fájl megnyitása..."
@@ -1216,11 +1511,13 @@
 msgid "Delete Status"
 msgstr "Állapot törlése"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:170
+#: ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:177
+#: ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1228,49 +1525,58 @@
 msgid "Title"
 msgstr "Beosztás"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:177
+#: ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Típus"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:177
+#: ../finch/gntstatus.c:554
+#: ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/gg/gg.c:1072
+#: ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594
+#: ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610
+#: ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624
+#: ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490
+#: ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Üzenet"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:189
+#: ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Használat"
 
@@ -1294,7 +1600,8 @@
 msgid "Substatus"
 msgstr "Alállapot"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454
+#: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Állapot:"
 
@@ -1328,108 +1635,106 @@
 msgstr "Vágólap bővítmény"
 
 #: ../finch/plugins/gntclipboard.c:152
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "A gnt vágólap tartalmának megváltozásakor a tartalom elérhetővé válik az X által, ha lehetséges."
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s belépett"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s kilépett"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s egy üzenetet küldött"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s kimondta az Ön nevét itt: %s"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s egy üzenetet küldött itt: %s"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Partner be-/kilép"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Üzenetet kap"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Valaki beszél egy csevegésben"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Valaki csevegés közben leírja az Ön nevét"
 
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Értesítsen egy kenyérpirítóval ha:"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Csipogjon is!"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "SÜRGŐS állapot beállítása a terminálablakhoz."
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Kenyérpirító bővítmény"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116
+#: ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Társalgás %s partnerrel ekkor: %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138
+#: ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Az előzmények bővítmény megköveteli a naplózást"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139
+#: ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "A naplózás engedélyezhető az Eszközök -> Beállítások -> Naplózás alatt.\n"
 "\n"
-"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok "
-"előzményeit is aktiválja."
+"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok előzményeit is aktiválja."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt előzmények"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181
+#: ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az "
-"aktuális társalgásba."
+#: ../finch/plugins/gnthistory.c:182
+#: ../pidgin/plugins/history.c:191
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az aktuális társalgásba."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1443,7 +1748,8 @@
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:123
+#: ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Lastlog bővítmény."
 
@@ -1451,7 +1757,8 @@
 msgid "accounts"
 msgstr "fiókok"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/account.c:937
+#: ../libpurple/protocols/jabber/auth.c:194
 #: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "A bejelentkezéshez jelszó szükséges."
@@ -1469,13 +1776,15 @@
 msgid "Save password"
 msgstr "Jelszó mentése"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010
+#: ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Hiányzó protokollbővítmény a következőhöz: %s"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170
+#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "Az új jelszavak nem egyeznek."
 
@@ -1509,22 +1818,28 @@
 msgid "Change user information for %s"
 msgstr "Felhasználó-információk megváltoztatása %s számára"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Felhasználói adatok beállítása"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/account.c:1744
+#: ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:230
+#: ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5201 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523
+#: ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520
+#: ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233
+#: ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Partnerek"
@@ -1547,8 +1862,9 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s kilépett"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/connection.c:440
+#: ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1558,7 +1874,8 @@
 msgid "Unable to send message: The message is too large."
 msgstr "Nem küldhető üzenet: az üzenet túl nagy."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:168
+#: ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nem küldhető üzenet a következőnek: %s."
@@ -1571,40 +1888,40 @@
 msgid "Unable to send message."
 msgstr "Az üzenetet nem lehet elküldeni."
 
-#: ../libpurple/conversation.c:1160
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Üzenet küldése"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "Üzenet kül_dése"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belépett a szobába."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] belépett a szobába."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ezentúl %s néven szerepel"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentúl %s néven szerepel"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobát."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobát (%s)."
@@ -1628,7 +1945,8 @@
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "A Purple D-BUS kiszolgálója nem fut az alábbi okok miatt"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:286
+#: ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Névtelen"
 
@@ -1640,7 +1958,8 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "Nem küldhető üzenet a feloldó folyamatnak\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:548
+#: ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1649,7 +1968,8 @@
 "Hiba %s feloldásakor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:551
+#: ../libpurple/dnsquery.c:710
 #: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
@@ -1677,7 +1997,7 @@
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1776,31 +2096,31 @@
 msgid "File transfer complete"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Megszakította %s átvitelét"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "Fájlátvitel megszakítva"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s megszakította %s átvitelét"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s megszakította a fájlátvitelt"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "A fájlátvitel %s partnerhez félbeszakadt."
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "A fájlátvitel %s partnertől félbeszakadt."
@@ -1874,76 +2194,40 @@
 msgstr "\"ymsgr\" URL címek kezelője"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"aim\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"aim\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
-"\"gg\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a \"gg\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"icq\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"icq\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"irc\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"irc\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"msnim\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"msnim\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
-"\"sip\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a \"sip\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"xmpp\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"xmpp\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"ymsgr\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"ymsgr\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak "
-"terminálban kell futnia."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak terminálban kell futnia."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2003,27 +2287,21 @@
 
 #: ../libpurple/log.c:1251
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
-"VÁLASZ&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS VÁLASZ&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1253
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
-"VÁLASZ&gt;:</b></font> %s<br/>\n"
-
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS VÁLASZ&gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1311
+#: ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>A naplófájl útvonala nem található!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1323
+#: ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>A fájl olvasása sikertelen: %s</b></font>"
@@ -2058,9 +2336,7 @@
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
 
 #: ../libpurple/plugin.c:552
@@ -2089,16 +2365,15 @@
 msgid "Autoaccept"
 msgstr "Automatikus elfogadás"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Fájlküldési kérések automatikus elfogadása kijelölt felhasználóktól."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr ""
-"\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a "
-"következőtől: \"%s\"."
+msgstr "\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a következőtől: \"%s\"."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2117,15 +2392,18 @@
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/plugins/autoaccept.c:165
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147
+#: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "Mé_gsem"
@@ -2164,12 +2442,12 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel "
-"befejeződésekor\n"
+"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel befejeződésekor\n"
 "(csak ha nem társalog a küldővel)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "Megjegyzések"
 
@@ -2202,9 +2480,7 @@
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
-"Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő "
-"partnerekhez."
+msgstr "Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő partnerekhez."
 
 #. *< type
 #. *< ui_requirement
@@ -2220,7 +2496,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Teszteli a libpurple beépített titkosítóit."
 
@@ -2257,26 +2534,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Lehetőséget nyújt fájlban megadott parancsokkal történő irányításra."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Perc"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Inaktív idő szerkesztése"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Fiók inaktivitási idejének beállítása"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Beállítás"
 
@@ -2284,7 +2567,8 @@
 msgid "None of your accounts are idle."
 msgstr "Egyik fiókja sem inaktív."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Fiók inaktivitási idejének visszaállítása"
 
@@ -2292,7 +2576,8 @@
 msgid "_Unset"
 msgstr "_Visszaállítás"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Inaktivitási idő beállítása minden fiókhoz"
 
@@ -2300,7 +2585,8 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inaktivitási idő törlése az összes inaktív fiókhoz"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Saját kezűleg állíthatja be, meddig volt inaktív az állapota"
 
@@ -2323,12 +2609,8 @@
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a "
-"kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
 
 #. *< type
 #. *< ui_requirement
@@ -2350,9 +2632,7 @@
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az "
-"IPC parancsokat."
+msgstr "Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az IPC parancsokat."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -2385,9 +2665,7 @@
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
 msgstr "Ez a bővítmény elrejti a belépés/kilépés üzeneteket nagy szobákban, a társalgásban aktívan résztvevő felhasználók kivételével."
 
 #. This is used in the place of a timezone abbreviation if the
@@ -2422,9 +2700,7 @@
 msgstr "Megszakadt a kapcsolat a kiszolgálóval."
 
 #: ../libpurple/plugins/log_reader.c:1603
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Jelenleg nincs csatlakozva. Nem fogadhat üzeneteket, amíg nem jelentkezik be."
 
 #: ../libpurple/plugins/log_reader.c:1618
@@ -2513,17 +2789,13 @@
 #. * description
 #: ../libpurple/plugins/log_reader.c:2140
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. "
-"Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
+"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
 "\n"
-"FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran "
-"összeomolhat. Csak saját felelősségére használja!"
+"FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran összeomolhat. Csak saját felelősségére használja!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -2555,38 +2827,26 @@
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"Új sort szúr be az üzenetek elé, így az üzenet további része a "
-"felhasználónév alatt jelenik meg a társalgás ablakában."
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "Új sort szúr be az üzenetek elé, így az üzenet további része a felhasználónév alatt jelenik meg a társalgás ablakában."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline üzenetek emulációja"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a "
-"Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
 
 #: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket "
-"figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb "
-"bejelentkezik?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb bejelentkezik?"
 
 #: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
@@ -2594,26 +2854,28 @@
 
 #: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-"A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/"
-"törölheti"
+msgstr "A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/törölheti"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522
+#: ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Igen"
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522
+#: ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:120
+#: ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Nem"
@@ -2632,14 +2894,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:596
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl bővítménybetöltő"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:598 ../libpurple/plugins/perl/perl.c:599
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Perl bővítmények betöltését támogatja."
 
@@ -2652,13 +2915,8 @@
 msgstr "Szellemmód bejövő kapcsolathoz"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik "
-"üzenetüket írni.  Ez az AIM, ICQ, Jabber, Sametime és Yahoo! protokollokkal "
-"működik."
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik üzenetüket írni.  Ez az AIM, ICQ, XMPP, Sametime és Yahoo! protokollokkal működik."
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -2713,7 +2971,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tesztek, hogy a legtöbb dolog működik-e."
 
@@ -2731,7 +2990,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Burkot biztosít az SSL-t támogató könyvtárakhoz."
 
@@ -2830,28 +3090,21 @@
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, "
-"visszaérkezik vagy az inaktív állapota megszűnik."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, visszaérkezik vagy az inaktív állapota megszűnik."
 
 #: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl bővítménybetöltő"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl bővítmények betöltését támogatja"
 
 #: ../libpurple/plugins/tcl/tcl.c:495
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, "
-"akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
 #. Send a message about the connection error
 #: ../libpurple/protocols/bonjour/bonjour.c:113
@@ -2866,17 +3119,21 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4490
-#: ../libpurple/protocols/oscar/oscar.c:5541
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:459 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442
+#: ../pidgin/gtkprefs.c:1823
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Távol"
@@ -2891,51 +3148,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokollbővítmény"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "Purple személy"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/bonjour/bonjour.c:589
 #: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Gépnév"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/bonjour/bonjour.c:593
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "Utónév"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/bonjour/bonjour.c:596
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "Vezetéknév"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/bonjour/bonjour.c:599
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
 #: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM fiók"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber fiók"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP fiók"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -2966,29 +3223,30 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "Érvénytelen proxybeállítások"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy "
-"típusához."
-
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:77
+#: ../libpurple/proxy.c:1800
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy típusához."
+
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Jelsor hiba"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Nem tölthető le a jelsor.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269
+#: ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Partnerlista mentése..."
 
@@ -2996,7 +3254,8 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A partnerlistája üres, semmi nem került a fájlba."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276
+#: ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "A fájl nem nyitható meg"
 
@@ -3004,7 +3263,8 @@
 msgid "Buddylist saved successfully!"
 msgstr "A partnerlista mentése sikeres!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307
+#: ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Nem tölthető be a partnerlista"
 
@@ -3040,25 +3300,30 @@
 msgid "Registration completed successfully!"
 msgstr "A regisztráció sikeresen befejeződött!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482
+#: ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Jelszó (megerősítés)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487
+#: ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Adja meg az aktuális jelsort"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:493
+#: ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuális jelsor"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:497
+#: ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Új Gadu-Gadu fiók regisztrálása"
 
@@ -3066,11 +3331,12 @@
 msgid "Please, fill in the following fields"
 msgstr "Töltse ki az alábbi mezőket"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Város"
@@ -3079,11 +3345,14 @@
 msgid "Year of birth"
 msgstr "Születési év"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/gg/gg.c:645
+#: ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:234
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Nem"
@@ -3093,14 +3362,14 @@
 msgstr "Férfi vagy nő"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Férfi"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3110,7 +3379,8 @@
 msgid "Only online"
 msgstr "Csak elérhetők"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:656
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Partnerek keresése"
 
@@ -3146,7 +3416,8 @@
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:794
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "A Gadu-Gadu jelszó megváltoztatása"
 
@@ -3155,52 +3426,65 @@
 msgid "Select a chat for buddy: %s"
 msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:874
+#: ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Felvétel csevegéshez..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5513
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3034 ../pidgin/gtkblist.c:3358
-#: ../pidgin/gtkdocklet.c:467 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/qq/qq.c:170
+#: ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2900
+#: ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450
+#: ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Kilépett"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/msn/state.c:29
+#: ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:455 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438
+#: ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2649
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/gg/gg.c:1038
+#: ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/gg/gg.c:1041
+#: ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Utónév"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Születési év"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/gg/gg.c:1108
+#: ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "A keresés eredményei nem jeleníthetők meg."
 
@@ -3220,7 +3504,8 @@
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1307
+#: ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "A foglalatot nem lehet olvasni"
 
@@ -3240,11 +3525,13 @@
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1506
+#: ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "A kapcsolódás meghiúsult."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
+#: ../libpurple/protocols/gg/gg.c:1618
+#: ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Tiltott"
 
@@ -3335,14 +3622,14 @@
 msgstr "Ismeretlen parancs: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "a jelenlegi téma: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Nincs beállítva téma"
@@ -3377,8 +3664,10 @@
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:127
+#: ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:614
+#: ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
@@ -3386,7 +3675,8 @@
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261
+#: ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "Cs_atorna:"
 
@@ -3401,57 +3691,59 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621
+#: ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "Nem sikerült létrehozni a foglalatot"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
 
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "A kapcsolódás sikertelen"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "Az SSL kézfogás sikertelen"
 
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611
+#: ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
@@ -3467,45 +3759,47 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokollbővítmény"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Az IRC protokollbővítmény, amely kevésbé rossz"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2122
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/irc/irc.c:941
+#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Kiszolgáló"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/irc/irc.c:944
+#: ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
-#: ../libpurple/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "Kódolások"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950
+#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
@@ -3515,7 +3809,8 @@
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/irc/irc.c:953
+#: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Valódi név"
@@ -3524,499 +3819,413 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "SSL használata"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Rossz üzemmód"
 
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Kitiltották a következőről: %s."
 
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Kitiltva"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nem lehet kitiltani a következőt: %s: a kitiltottak listája tele van"
 
-#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:293
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(azonosítva)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:294
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Becenév"
 
-#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Jelenleg a következőn"
 
-#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Inaktív"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Jelző meghatározása:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Ragyogó"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s megváltoztatta a témát a következőre: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s törölte a témát."
 
-#: ../libpurple/protocols/irc/msgs.c:418
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s témája: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:436
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "\"%s\" üzenet ismeretlen"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "Ismeretlen üzenet"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "Az IRC kiszolgáló olyan üzenetet kapott, amit nem tudott értelmezni."
 
-#: ../libpurple/protocols/irc/msgs.c:458
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Felhasználók a következőn: %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:555
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "Válaszidő"
 
-#: ../libpurple/protocols/irc/msgs.c:556
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "Az IRC kiszolgáló helyi ideje:"
 
-#: ../libpurple/protocols/irc/msgs.c:567
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "Nincs ilyen csatorna"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "nincs ilyen csatorna"
 
-#: ../libpurple/protocols/irc/msgs.c:581
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "A felhasználó nincs bejelentkezve"
 
-#: ../libpurple/protocols/irc/msgs.c:586
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "Nincs ilyen becenév/csatorna"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "Nem sikerült elküldeni"
 
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Meghívásra van szükség a következőhöz csatlakozáshoz: %s."
 
-#: ../libpurple/protocols/irc/msgs.c:663
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "Meghívásos"
 
-#: ../libpurple/protocols/irc/msgs.c:775
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s kirúgta Önt: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797
+#: ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s kizárta (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mód (%s %s) %s által"
 
-#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
+#: ../libpurple/protocols/irc/msgs.c:905
+#: ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
-#: ../libpurple/protocols/irc/msgs.c:890
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg "
-"érvénytelen karaktereket tartalmaz."
-
-#: ../libpurple/protocols/irc/msgs.c:895
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg "
-"érvénytelen karaktereket tartalmaz."
-
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:907
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+
+#: ../libpurple/protocols/irc/msgs.c:912
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "A becenév nem változtatható meg"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "Nem sikerült megváltoztatni a becenevet"
 
-#: ../libpurple/protocols/irc/msgs.c:955
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Elhagyta a(z) %s%s csatornát"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "Hiba: érvénytelen PONG a kiszolgálótól"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING válasz -- Késleltetés %lu másodperc"
 
-#: ../libpurple/protocols/irc/msgs.c:1080
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Nem lehet csatlakozni ehhez: %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s csatornához nem lehet csatlakozni: Regisztráció szükséges."
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nem lehet csatlakozni a csatornához"
 
-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "A becenév vagy csatorna átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/irc/msgs.c:1127
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "Ütések a következőtől: %s"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;elvégzendő művelet&gt;:  Egy művelet elvégzése."
 
-#: ../libpurple/protocols/irc/parse.c:122
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva "
-"visszatér a távollétből."
-
 #: ../libpurple/protocols/irc/parse.c:123
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva visszatér a távollétből."
+
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: parancs küldése a chanserv kiszolgálónak."
 
-#: ../libpurple/protocols/irc/parse.c:124
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele "
-"valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
-
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele "
-"valakitől, így nem beszélhet, ha a csatorna moderált (+m). "
-"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a "
-"megadott vagy a jelenlegi csatornán."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele valakitől, így nem beszélhet, ha a csatorna moderált (+m). Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy "
-"több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a megadott vagy a jelenlegi csatornán."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy "
-"vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha "
-"szükséges."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. "
-"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. "
-"<i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt "
-"a parancsot.</i>"
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:131
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. <i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt a parancsot.</i>"
+
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;elvégzendő művelet&gt;:  Végrehajt egy műveletet."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: parancs küldése a memoserv kiszolgálónak."
 
-#: ../libpurple/protocols/irc/parse.c:133
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;becenév|csatorna|&gt;:  Csatorna- vagy "
-"felhasználómód beállítása vagy visszavonása."
-
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
-"(nem pedig a csatornának)."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;becenév|csatorna|&gt;:  Csatorna- vagy felhasználómód beállítása vagy visszavonása."
 
 #: ../libpurple/protocols/irc/parse.c:135
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
+
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [csatorna]:  Kilistázza a csatornán jelenlévő felhasználókat."
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1800
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;új becenév&gt;:  Megváltoztatja a becenevét."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: parancs küldése a nickserv kiszolgálónak."
 
-#: ../libpurple/protocols/irc/parse.c:138
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása "
-"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
-
 #: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
-"tudja."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid "operserv: Send a command to operserv"
-msgstr "openserv: parancs küldése az openserv kiszolgálónak."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
 
 #: ../libpurple/protocols/irc/parse.c:141
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, "
-"egy opcionális üzenettel."
+msgid "operserv: Send a command to operserv"
+msgstr "openserv: parancs küldése az openserv kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha "
-"nincs megadva) késése."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, egy opcionális üzenettel."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
-"(nem pedig a csatornának)."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha nincs megadva) késése."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális "
-"üzenettel."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
 
 #: ../libpurple/protocols/irc/parse.c:145
-msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális üzenettel."
 
 #: ../libpurple/protocols/irc/parse.c:146
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. "
-"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:147
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Megjeleníti az IRC kiszolgáló jelenlegi helyi idejét."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [új téma]:  A csatorna témájának megtekintése vagy megváltoztatása."
 
-#: ../libpurple/protocols/irc/parse.c:149
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy "
-"visszavonása."
-
 #: ../libpurple/protocols/irc/parse.c:150
-msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [becenév]: CTCP VERSION kérés küldése felhasználónak"
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy visszavonása."
 
 #: ../libpurple/protocols/irc/parse.c:151
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása "
-"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [becenév]: CTCP VERSION kérés küldése felhasználónak"
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
-"tudja."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
 
 #: ../libpurple/protocols/irc/parse.c:154
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
+
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;becenév&gt;: Információk lekérése egy kijelentkezett felhasználóról."
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Válaszidő a következőtől: %s: %lu másodperc"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING válasz"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Kapcsolat bontva."
 
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
-"támogatása nem található."
+msgstr "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek támogatása nem található."
 
 #: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
-msgid "Plaintext Authentication"
-msgstr "Egyszerű szöveges hitelesítés"
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "%s szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
 
 #: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított "
-"csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
-
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
+msgid "Plaintext Authentication"
+msgstr "Egyszerű szöveges hitelesítés"
+
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
 msgid "Server does not use any supported authentication method"
 msgstr "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Érvénytelen válasz a kiszolgálótól."
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:572
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
+
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "Érvénytelen hívás a kiszolgálótól"
 
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL hiba"
 
@@ -4039,7 +4248,7 @@
 msgstr "Keresztnév"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
@@ -4083,7 +4292,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4107,30 +4316,27 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Születésnap"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3045
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Leírás"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard szerkesztése"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard szerkesztése"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, "
-"amelyek nem okoznak kényelmetlenséget."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, amelyek nem okoznak kényelmetlenséget."
 
 #: ../libpurple/protocols/jabber/buddy.c:651
 #: ../libpurple/protocols/jabber/buddy.c:692
@@ -4143,16 +4349,16 @@
 msgstr "Operációs rendszer"
 
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "Erőforrás"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "Prioritás"
 
@@ -4162,9 +4368,9 @@
 msgstr "Középső név"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
@@ -4182,132 +4388,129 @@
 msgid "Logo"
 msgstr "Logó"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "Rejtettség visszavonása"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "Beszédes"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436
+#: ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "Nem vagyok a gépnél"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne zavarjanak"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "A keresés eredményei a következők"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne "
-"feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
-
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1694
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "A címtárlekérdezés sikertelen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "A címtárkiszolgáló lekérdezése nem sikerült."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Kiszolgálóutasítások: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Töltsön ki legalább egy mezőt a megfelelő Jabber felhasználók kereséséhez."
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "E-mail cím"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "Jabber felhasználók keresése"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "XMPP felhasználók keresése"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "Érvénytelen címtár"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "Adjon meg egy felhasználói címtárat"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "Válasszon ki egy felhasználói címtárat a kereséshez"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "Keresés a címtárban"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sz_oba:"
@@ -4320,80 +4523,80 @@
 msgid "_Handle:"
 msgstr "A_zonosító:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s érvénytelen szobanév"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Érvénytelen szobanév"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s érvénytelen kiszolgálónév"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Érvénytelen kiszolgálónév"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s érvénytelen szobaazonosító"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Érvénytelen szobaazonosító"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Beállítási hiba"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "A beállítás sikertelen"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Szobabeállítási hiba"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Ezt a szobát nem lehet beállítani"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Regisztrációs hiba"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "A nem-MUC csevegőszobákban nem támogatott a becenév megváltoztatása"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Hiba szobalista letöltése közben"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Érvénytelen kiszolgáló"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Adjon meg egy konferenciakiszolgálót"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Válassza ki a lekérdezendő konferenciakiszolgálót"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Szobák keresése"
 
@@ -4416,450 +4619,443 @@
 msgid "Unable to create socket"
 msgstr "Nem lehet létrehozni foglalatot"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Érvénytelen Jabber azonosító"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "Érvénytelen XMPP azonosító"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Érvénytelen XMPP azonosító. A tartományt be kell állítani."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s regisztrációja sikeres"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "A regisztráció sikeres"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Ismeretlen hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "A regisztráció sikertelen"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "Már regisztrálva van"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Állam"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "Irányítószám"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "Dátum"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "Kérem adja meg a következő információkat az új fiók regisztrálásához."
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "Új Jabber fiók regisztrálása"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "Új XMPP fiók regisztrálása"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:877
+#: ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "Regisztráció"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "Folyam inicializálása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Hitelesítés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "A folyam újrainicializálása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1489
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "Mindkettő"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "Feladó (Címzett függőben)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "Címzett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nincs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "Feliratkozás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "Jelszó megváltoztatva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "A jelszava meg lett változtatva."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "Hiba a jelszó megváltoztatásakor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "Jelszó (még egyszer)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Jabber jelszó megváltoztatása"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "XMPP jelszó megváltoztatása"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Kérem adja meg az új jelszavát"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Felhasználói információk beállítása..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1386
-#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
 #: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Jelszó megváltoztatása..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1391
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Felhasználók keresése..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Hibás kérés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Ütközés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "A szolgáltatás nincs megvalósítva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Tiltva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Elment"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Belső kiszolgálóhiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Az elem nem található"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
-msgid "Malformed Jabber ID"
-msgstr "Rosszul formázott Jabber azonosító"
-
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "Rosszul formázott XMPP azonosító"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Nem fogadható el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Nem engedélyezett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Fizetés szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "A címzett nem érhető el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Regisztráció szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "A távoli kiszolgáló nem található"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Időtúllépés a távoli kiszolgálón"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "A kiszolgáló túl van terhelve"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "A szolgáltatás nem érhető el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Feliratkozás szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Váratlan kérés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Hitelesítés megszakítva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Hibás kódolás a hitelesítésben"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Érvénytelen authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Érvénytelen hitelesítési eljárás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "A hitelesítési eljárás túl gyenge"
 
-#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Átmeneti hitelesítési hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Hitelesítési hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Rossz formátum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Rossz névtér-előtag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Erőforrás-ütközés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Időtúllépés miatt a kapcsolat megszakadt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "A gép eltűnt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Ismeretlen gép"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Hiányos címzés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Érvénytelen azonosító"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Érvénytelen névtér"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Érvénytelen XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Nem illeszkedő gépek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Szabályok megsértése"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Távoli kapcsolat sikertelen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Erőforrás-megszorítás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Korlátozott XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Lásd a másik gépet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Rendszerleállítás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Meghatározatlan feltétel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Nem támogatott kódolás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Nem támogatott Stanza típus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Nem támogatott verzió"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "Nem megfelelően formázott XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Folyamhiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nem lehet kitiltani %s felhasználót"
 
-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ismeretlen kapcsolat: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "%s felhasználó kapcsolata nem állítható be a következőre: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ismeretlen szerep: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1708
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "A(z) \"%s\" szerep nem állítható be a következő felhasználónak: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nem lehet kirúgni %s felhasználót"
 
-#: ../libpurple/protocols/jabber/jabber.c:1792
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Csevegőszoba beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [szoba]:  A szoba elhagyása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  Regisztráció csevegőszobánál."
 
-#: ../libpurple/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [új téma]:  A téma megtekintése vagy megváltoztatása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;felhasználó&gt; [szoba]:  Felhasználó kitiltása a szobából."
 
-#: ../libpurple/protocols/jabber/jabber.c:1828
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
-"felhasználó a szobával fennálló kapcsolatának beállítása."
-
-#: ../libpurple/protocols/jabber/jabber.c:1834
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: "
-"Beállítja a felhasználó szerepét a szobában."
-
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1841
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy felhasználó a szobával fennálló kapcsolatának beállítása."
+
+#: ../libpurple/protocols/jabber/jabber.c:1847
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: Beállítja a felhasználó szerepét a szobában."
+
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;felhasználó&gt; [üzenet]:  Felhasználó meghívása a szobába."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott "
-"kiszolgálón."
-
-#: ../libpurple/protocols/jabber/jabber.c:1852
+msgstr "join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott kiszolgálón."
+
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;felhasználó&gt; [szoba]:  Felhasználó kirúgása a szobából."
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik "
-"felhasználónak."
+msgstr "msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik felhasználónak."
 
 #. *< type
 #. *< ui_requirement
@@ -4873,53 +5069,63 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokollbővítmény"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokollbővítmény"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "Tartomány"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "Régi (5223 port) SSL kényszerítése"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Kapcsolódási port"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
-#: ../libpurple/protocols/silc/silc.c:1848
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Kapcsolatkiszolgáló"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s elhagyta a társalgást."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "%s üzenetet küldött"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a következő témát állította be: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "A téma: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Az üzenet eljuttatása a következőhöz: %s sikertelen: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber üzenethiba"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP üzenethiba"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (%s kód)"
@@ -4938,12 +5144,8 @@
 msgstr "Új szoba létrehozása"
 
 #: ../libpurple/protocols/jabber/presence.c:354
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az "
-"alapbeállításokat?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az alapbeállításokat?"
 
 #: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
@@ -4966,9 +5168,7 @@
 #: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja "
-"fájlok átvitelét"
+msgstr "Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja fájlok átvitelét"
 
 #: ../libpurple/protocols/jabber/si.c:766
 #: ../libpurple/protocols/jabber/si.c:767
@@ -4982,21 +5182,13 @@
 
 #: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. "
-"Szeretné ezt a partnert felvenni?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. Szeretné ezt a partnert felvenni?"
 
 #: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a "
-"partnert felvenni?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a partnert felvenni?"
 
 #: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
@@ -5191,8 +5383,9 @@
 msgstr "A kiszolgáló túl elfoglalt"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/silc/ops.c:1718
+#: ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
@@ -5227,371 +5420,371 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN hiba: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Becenév beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ezen a néven fogják látni az MSN partnerei."
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Otthoni telefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Munkahelyi telefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Mobiltelefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Engedélyezi az MSN mobil oldalakat?"
 
-#: ../libpurple/protocols/msn/msn.c:314
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil "
-"oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
-
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:323
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Tiltás"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Mobilüzenet küldése."
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Oldal"
 
-#: ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Szerepel-e a listáján"
 
-#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "Rögtön jövök"
 
-#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555
+#: ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "Elfoglalt vagyok"
 
-#: ../libpurple/protocols/msn/msn.c:567
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "Telefonálok"
 
-#: ../libpurple/protocols/msn/msn.c:571
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "Ebédelni mentem"
 
-#: ../libpurple/protocols/msn/msn.c:599
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Becenév beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Otthoni telefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Munkahelyi telefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Mobiltelefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:618
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobileszközök engedélyezése/tiltása..."
 
-#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobiloldalak engedélyezése/tiltása..."
 
-#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail bejövő levelek megnyitása"
 
-#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Küldés mobiltelefonra"
 
-#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Csevegés ke_zdeményezése"
 
-#: ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL könyvtárat."
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
 
-#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1458
+#: ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
 
-#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529
+#: ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Általános"
 
-#: ../libpurple/protocols/msn/msn.c:1528
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Kor"
 
-#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Foglalkozás"
 
-#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Hely"
 
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1544
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742
+#: ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "Hobbik és érdeklődési kör"
 
-#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
-#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "Magamról röviden"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "Társadalmi"
 
-#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Családi állapot"
 
-#: ../libpurple/protocols/msn/msn.c:1562
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "Érdeklődési kör"
 
-#: ../libpurple/protocols/msn/msn.c:1563
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "Állatok"
 
-#: ../libpurple/protocols/msn/msn.c:1564
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "Szülőváros"
 
-#: ../libpurple/protocols/msn/msn.c:1565
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "Lakóhelyek"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "Divat"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "Zene"
 
-#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Kedvenc idézet"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "Kapcsolatinformációk"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "Személyes"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "Társ"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1593
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Otthoni cím"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "Személyes mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "Saját e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "Saját azonnali üzenő"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "Évforduló"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "Munka"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Beosztás"
 
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Cég"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Részleg"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "Foglalkozás"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "Munkahelyi telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Munkahelyi cím"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "Munkahelyi mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "Munkahelyi személyhívó"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "Munkahelyi fax"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "Munkahelyi e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "Munkahelyi azonnali üzenő"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "Kezdés dátuma"
 
-#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1707
+#: ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720
+#: ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "Kedvenc dolgok"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Honlap"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "A felhasználó nem hozott létre nyilvános profilt."
 
-#: ../libpurple/protocols/msn/msn.c:1797
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a "
-"felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre "
-"nyilvános profilt."
-
-#: ../libpurple/protocols/msn/msn.c:1801
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr "Nem találhatók információk a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
+#: ../libpurple/protocols/msn/msn.c:1805
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre nyilvános profilt."
 
 #: ../libpurple/protocols/msn/msn.c:1809
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Nem találhatók információk a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
+
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profil URL-je"
@@ -5606,19 +5799,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
+#: ../libpurple/protocols/msn/msn.c:2103
+#: ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokollbővítmény"
 
-#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "HTTP eljárás használata"
 
-#: ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
-msgstr "Egyéni hangulatjelek beállítása"
-
-#: ../libpurple/protocols/msn/msn.c:2144
+msgstr "Egyéni hangulatjelek megjelenítése"
+
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
@@ -5687,40 +5881,30 @@
 msgid "Service Temporarily Unavailable."
 msgstr "A szolgáltatás átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "Nem lehet átnevezni a csoportot"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "Nem lehet törölni a csoportot"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
-"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
-"társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 msgstr[1] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
-"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
-"társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 
@@ -5750,16 +5934,14 @@
 msgstr "Hiba a HTTP feldolgozása közben."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/oscar/oscar.c:3454
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Bejelentkezett egy másik helyről."
 
 #: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja "
-"újra később."
+msgstr "Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja újra később."
 
 #: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
@@ -5772,9 +5954,7 @@
 
 #: ../libpurple/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja "
-"újra később."
+msgstr "Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja újra később."
 
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/msn/session.c:347
@@ -5861,127 +6041,123 @@
 msgid "The screen name specified is invalid."
 msgstr "A megadott felhasználónév érvénytelen."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "A szükséges paraméterek átadása sikertelen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Nem lehet a hálózatra írni"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Nem lehet a hálózatról olvasni"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Hiba a kiszolgálóval végzett kommunikációban"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "A konferencia nem található"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "A konferencia nem létezik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ilyen nevű mappa már létezik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "A jelszó lejárt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Hibás jelszó"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "A felhasználó nem található"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "A fiók le lett tiltva"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "A kiszolgáló nem tudott hozzáférni a címtárhoz"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "A rendszeradminisztrátora letiltotta ezt a műveletet"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "A kiszolgáló nem érhető el, próbálkozzon később"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "A kapcsolat nem adható kétszer ugyanahhoz a mappához"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Önmagát nem adhatja hozzá"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "A főarchívum hibásan van beállítva"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Hibás felhasználónév vagy jelszó"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "A megadott felhasználónévhez tartozó kiszolgáló nem ismerhető fel"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+#: ../libpurple/protocols/novell/nmuser.c:1928
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "A fiókja le lett tiltva, mivel túl sok érvénytelen jelszót adott meg"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Ugyanazt a személyt nem adhatja hozzá kétszer egy társalgáshoz"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Elérte az engedélyezett kapcsolatok számát"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Helytelen felhasználónevet adott meg"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Hiba lépett fel a címtár frissítése közben"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Inkompatibilis protokollverzió"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "A felhasználó letiltotta Önt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+#: ../libpurple/protocols/novell/nmuser.c:1950
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "A felhasználó kilépett, vagy Ön le van tiltva"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Ismeretlen hiba: 0x%X"
@@ -5994,9 +6170,7 @@
 #: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
-"s)."
+msgstr "Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:396
 #, c-format
@@ -6018,9 +6192,7 @@
 #: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni "
-"a konferenciát (%s)."
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni a konferenciát (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
@@ -6029,21 +6201,13 @@
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali "
-"listán. Hiba a mappa létrehozása közben (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali listán. Hiba a mappa létrehozása közben (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa "
-"létrehozása közben a kiszolgálóoldali listában (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa létrehozása közben a kiszolgálóoldali listában (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:705
 #, c-format
@@ -6174,12 +6338,8 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../libpurple/protocols/novell/novell.c:2167
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
-"amelyikhez kapcsolódni szeretne."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, amelyikhez kapcsolódni szeretne."
 
 #: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
@@ -6213,19 +6373,25 @@
 msgstr "Kiszolgáló portja"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/ycht.c:481
+#: ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085
+#: ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296
+#: ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "A kiszolgáló lezárta a kapcsolatot."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443
+#: ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097
+#: ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308
+#: ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6235,8 +6401,10 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1114
+#: ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320
+#: ../libpurple/proxy.c:1392
 #: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól."
@@ -6281,8 +6449,8 @@
 msgstr "ICQ protokollbővítmény"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kódolás"
 
@@ -6412,166 +6580,159 @@
 msgid "Not while on AOL"
 msgstr "Nem, amíg az AOL-on tartózkodik"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(Hiba történt az üzenet fogadása során. A partner, akivel cseveg "
-"valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner "
-"milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó "
-"fiókbeállításainál.)"
-
-#: ../libpurple/protocols/oscar/oscar.c:438
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző "
-"kódolást használnak, vagy %s hibás klienst használ.)"
+#: ../libpurple/protocols/oscar/oscar.c:330
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(Hiba történt az üzenet fogadása során. A partner, akivel cseveg valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó fiókbeállításainál.)"
+
+#: ../libpurple/protocols/oscar/oscar.c:439
+#, c-format
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző kódolást használnak, vagy %s hibás klienst használ.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Partnerikon"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Hang"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM közvetlen azonnali üzenetek"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "Fájl letöltése"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Játékok"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Kiegészítők"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Partnerlista küldése"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ közvetlen kapcsolat"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP felhasználó"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ közvetítő kiszolgáló"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Régi ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian titkosítás"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Biztonság engedélyezve"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Videócsevegés"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Élő videó"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Fényképezőgép"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "Nem érhető el"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "Elfoglalt"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "A weben"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:463 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:719
+#: ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446
+#: ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "Elérhető"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3688
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697
+#: ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP cím"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Figyelmeztetési szint"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Partnermegjegyzés"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6580,7 +6741,7 @@
 "Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6589,177 +6750,159 @@
 "Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Felhasználónév elküldve"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat létrejött, süti elküldve"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Kapcsolódás befejezése"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
-"érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, "
-"számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
-
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/oscar/oscar.c:1243
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
+
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "Érvénytelen felhasználónév."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "Helytelen jelszó."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "A fiókja jelenleg fel van függesztve."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
-"tovább folytatja, még többet kell majd várnia."
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha tovább folytatja, még többet kell majd várnia."
+
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a "
-"következő helyről: %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:1388
+msgstr "A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a következő helyről: %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "A hitelesítés fogadva"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "A megadott SecurID kulcs érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "Adja meg a SecurID-t"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Írja be a hatjegyű számot a digitális képernyőről."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2224
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1472
-#: ../libpurple/protocols/oscar/oscar.c:1515
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. "
-"Frissítésekért keresse fel a következő címet: %s."
-
-#: ../libpurple/protocols/oscar/oscar.c:1475
-#: ../libpurple/protocols/oscar/oscar.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. Frissítésekért keresse fel a következő címet: %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nem kérhető le érvényes AIM belépő hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1604
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő "
-"címet: %s."
-
-#: ../libpurple/protocols/oscar/oscar.c:1607
+msgstr "Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő címet: %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "Nem kérhető le érvényes belépő hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1633
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Jelszó elküldve"
 
-#: ../libpurple/protocols/oscar/oscar.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "A kapcsolat nem inicializálható"
 
-#: ../libpurple/protocols/oscar/oscar.c:2194
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Kérem engedélyezze, hogy felvehessem a partnereim közé."
 
-#: ../libpurple/protocols/oscar/oscar.c:2222
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "Engedélyezést kérő üzenet:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "Kérem engedélyezze, hogy felvegyem!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2263
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2397
-#: ../libpurple/protocols/oscar/oscar.c:5192
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "Nincs ok megadva."
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Engedélyezést elutasító üzenet:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
-"következő indoklással:\n"
+"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ engedélyezés elutasítva."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "%u felhasználó elfogadta a kérését, így felveheti őt a partnerlistájára."
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6772,7 +6915,7 @@
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6785,7 +6928,7 @@
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6798,31 +6941,32 @@
 "Az üzenet:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2450
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "%u ICQ felhasználó küldött Önnek egy partnert: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Fel kívánja venni ezt a partnert a listájára?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467
+#: ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../libpurple/protocols/oscar/oscar.c:2546
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -6832,40 +6976,28 @@
 # #: ../src/protocols/oscar/oscar.c:1605
 # #, c-format
 # msgid "You missed %d message from %s because the rate limit has been exceeded."
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
-"gyakoriságának a korlátját."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
-"gyakoriságának a korlátját."
-
-#: ../libpurple/protocols/oscar/oscar.c:2573
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
+
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
-"rosszindulatú volt."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
-"rosszindulatú volt."
-
-#: ../libpurple/protocols/oscar/oscar.c:2582
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
+
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
-"volt."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
-"volt."
-
-#: ../libpurple/protocols/oscar/oscar.c:2591
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
+
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -6873,550 +7005,471 @@
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Az üzenetet nem lehet elküldeni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2746
-#: ../libpurple/protocols/oscar/oscar.c:2751
-#: ../libpurple/protocols/oscar/oscar.c:2813
-#: ../libpurple/protocols/oscar/oscar.c:2817
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Ismeretlen ok."
 
-#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "A felhasználó információi nem érhetőek el: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s felhasználó információi nem érhetőek el:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Tag ezóta"
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Képességek"
 
-#: ../libpurple/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Elérhetőségi üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "Az AIM kapcsolata megszakadhatott."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3175
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
-"érvénytelen karaktereket tartalmazott.]"
-
-#: ../libpurple/protocols/oscar/oscar.c:3378
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. "
-"Kérem várjon 10 másodpercet és próbálja meg újra."
-
-#: ../libpurple/protocols/oscar/oscar.c:3450
+#: ../libpurple/protocols/oscar/oscar.c:3181
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az érvénytelen karaktereket tartalmazott.]"
+
+#: ../libpurple/protocols/oscar/oscar.c:3384
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. Kérem várjon 10 másodpercet és próbálja meg újra."
+
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "Ismeretlen okból ki lett jelentkeztetve."
 
-#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilépett a(z) %s csevegőszobából."
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Saját weboldal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "További információ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Irányítószám"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Részleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Pozíció"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Weboldal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Munkahelyi adatok"
 
-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Felbukkanó üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "A következő felhasználónév a következőhöz van rendelve: %s"
 msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3903
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Felhasználónév"
 
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nem található eredmény a(z) %s e-mail címre"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Kapnia kell egy %s jóváhagyását kérő levelet."
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Fiókjóváhagyás megkérve"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Hiba a fiók információinak megváltoztatása közben"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
-"felhasználónév eltér az eredetitől."
-
-#: ../libpurple/protocols/oscar/oscar.c:3989
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az "
-"érvénytelen."
-
 #: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
-"felhasználónév túl hosszú."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért felhasználónév eltér az eredetitől."
 
 #: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már "
-"függőben van erre a felhasználónévre."
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az érvénytelen."
 
 #: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
-"cím túl sok felhasználónévhez van társítva."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért felhasználónév túl hosszú."
 
 #: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
-"cím érvénytelen."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már függőben van erre a felhasználónévre."
 
 #: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím túl sok felhasználónévhez van társítva."
+
+#: ../libpurple/protocols/oscar/oscar.c:4007
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím érvénytelen."
+
+#: ../libpurple/protocols/oscar/oscar.c:4010
+#, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Hiba 0x%04x: Ismeretlen hiba."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s e-mail címe a következő: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "Fiókinformációk"
 
-#: ../libpurple/protocols/oscar/oscar.c:4187
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban "
-"kell lennie."
-
-#: ../libpurple/protocols/oscar/oscar.c:4432
+msgstr "Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban kell lennie."
+
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "Nem lehet beállítani az AIM profilt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4433
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg "
-"beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már "
-"megtörtént."
-
-#: ../libpurple/protocols/oscar/oscar.c:4447
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4440
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már megtörtént."
+
+#: ../libpurple/protocols/oscar/oscar.c:4454
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 msgstr[1] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libpurple/protocols/oscar/oscar.c:4452
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "A profil túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
 msgstr[1] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "A távollét-üzenet túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4571
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
-"felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és "
-"szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
-
-#: ../libpurple/protocols/oscar/oscar.c:4573
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:5010
+#: ../libpurple/protocols/oscar/oscar.c:4578
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
+
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "Nem sikerült felvenni"
 
-#: ../libpurple/protocols/oscar/oscar.c:4677
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nem lehet lekérni a partnerek listáját"
 
-#: ../libpurple/protocols/oscar/oscar.c:4678
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+#: ../libpurple/protocols/oscar/oscar.c:4685
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Az AIM kiszolgálók ideiglenesen nem tudták elküldeni a partnerlistáját. A partnerlistája nem veszett el és néhány órán belül valószínűleg elérhetővé válik."
 
-#: ../libpurple/protocols/oscar/oscar.c:4882
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:5064
-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "Árvák"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
-"Kérem töröljön egyet közülük és próbálja meg újra."
-
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. Kérem töröljön egyet közülük és próbálja meg újra."
+
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(nincs név)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5008
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, "
-"hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
-
-#: ../libpurple/protocols/oscar/oscar.c:5102
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel "
-"akarja venni őt?"
+#: ../libpurple/protocols/oscar/oscar.c:5015
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
 
 #: ../libpurple/protocols/oscar/oscar.c:5108
+#, c-format
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel akarja venni őt?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "Engedély megadva"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "%s felhasználó engedélyezi, hogy felvegye őt a partnerei közé."
 
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "Engedély kiadva"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
-"következő indoklással:\n"
+"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "Engedély elutasítva"
 
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Váltás:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "A megadott csevegésnév érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Az Ön IM képe nem lett elküldve. Nem küldhet IM képeket AIM csevegésekbe."
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "Távol üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(lekérés)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s partnermegjegyzése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "Partnermegjegyzés:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Közvetlen kapcsolat nyitását választotta %s partnerrel."
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági "
-"kockázatként. Folytatni kívánja?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5844
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági kockázatként. Folytatni kívánja?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "AIM információk lekérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "Partnermegjegyzés szerkesztése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "Állapotüzenet lekérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "Közvetlen IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "Engedélyezés újrakérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "Engedélyezés kérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "A weben ismert (ennek engedélyezése után SPAM-et fog kapni!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ magánszféra beállításai"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
-msgid "The new formatting is invalid."
-msgstr "Az új formázás érvénytelen."
-
 #: ../libpurple/protocols/oscar/oscar.c:6020
+msgid "The new formatting is invalid."
+msgstr "Az új formázás érvénytelen."
+
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely "
-"karaktereket változtathatja meg."
-
-#: ../libpurple/protocols/oscar/oscar.c:6073
+msgstr "A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely karaktereket változtathatja meg."
+
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "Cím megváltoztatása a következőre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Ön nem vár engedélyezésre</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
-msgid "You are awaiting authorization from the following buddies"
-msgstr "A következő partnerektől vár engedélyezésre"
-
 #: ../libpurple/protocols/oscar/oscar.c:6123
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
-"kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
-
-#: ../libpurple/protocols/oscar/oscar.c:6140
+msgid "You are awaiting authorization from the following buddies"
+msgstr "A következő partnerektől vár engedélyezésre"
+
+#: ../libpurple/protocols/oscar/oscar.c:6124
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
+
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "Partnerek keresése e-mail cím szerint"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
-msgid "Search for a buddy by e-mail address"
-msgstr "Partner keresése e-mail cím alapján"
-
 #: ../libpurple/protocols/oscar/oscar.c:6142
+msgid "Search for a buddy by e-mail address"
+msgstr "Partner keresése e-mail cím alapján"
+
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Adja meg annak a partnernek az e-mail címét, akit keres."
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "_Keresés"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "Felhasználói információk beállítása (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "Jelszó megváltoztatása (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "Üzenettovábbítás beállítása (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "Magánszféra-beállítások..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "A jelenleg regisztrált e-mail cím megjelenítése"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "A jelenleg regisztrált e-mail cím megváltoztatása..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Partner keresése e-mail cím szerint..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "A legutóbbi partnerek csoport használata"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "Megjeleníti, meddig volt inaktív"
 
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7444,14 +7497,8 @@
 msgstr "%s felkérte a közvetlen kapcsolatra a következőhöz: %s"
 
 #: ../libpurple/protocols/oscar/peer.c:1014
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM "
-"képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a "
-"magánszférája biztonságát."
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a magánszférája biztonságát."
 
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
@@ -7624,9 +7671,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
 msgstr "Az egyéni arcképek beállítása jelenleg nem támogatott. Válasszon egy képet innen: %s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
@@ -7918,12 +7963,13 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/qq/qq.c:139
+#: ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8012,7 +8058,8 @@
 msgid "Modify My Information"
 msgstr "Információim módosítása"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:534
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
@@ -8038,7 +8085,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:723
+#: ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tbővítmény"
 
@@ -8210,9 +8258,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s "
-"kiszolgálón"
+msgstr "Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s kiszolgálón"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
@@ -8282,12 +8328,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-"Adja meg az új konferencia témáját és a(z) %s számára elküldendő "
-"meghívóüzenetet."
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "Adja meg az új konferencia témáját és a(z) %s számára elküldendő meghívóüzenetet."
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
@@ -8311,14 +8353,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s "
-"felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új "
-"konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
@@ -8332,7 +8368,8 @@
 msgid "Send TEST Announcement"
 msgstr "TESZT bejelentés küldése"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "Téma:"
 
@@ -8342,12 +8379,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés "
-"folytatásához adjon meg egyet alább."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés folytatásához adjon meg egyet alább."
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
@@ -8367,12 +8400,12 @@
 msgstr "Utolsó ismert kliens"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Felhasználónév"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime azonosító"
 
@@ -8382,12 +8415,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza "
-"ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
@@ -8399,12 +8428,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a "
-"bejegyzés eltávolításra került a partnerlistájából."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a bejegyzés eltávolításra került a partnerlistájából."
 
 #: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
@@ -8443,151 +8468,126 @@
 msgid "Synchronize List with Server"
 msgstr "Lista szinkronizálása a kiszolgálóval"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "A(z) %s fiók Sametime listájának importálása"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "A(z) %s fiók Sametime listájának exportálása"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "A csoport nem vehető fel: a csoport már létezik"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Már létezik \"%s\" nevű csoport a partnerlistán."
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Nem vehető fel a csoport"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Lehetséges találatok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes címjegyzék csoporteredmények"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére "
-"hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az "
-"alábbi listából."
-
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5389
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az alábbi listából."
+
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Válasszon Notes címjegyzéket"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Nem vehető fel a csoport: a csoport nem található"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
-#, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-"A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes "
-"címjegyzékcsoportjának sem felelt meg."
-
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5439
+#, c-format
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes címjegyzékcsoportjának sem felelt meg."
+
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes címjegyzékcsoport"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet "
-"tagjaival együtt fel kíván venni a partnerlistájára."
-
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5481
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet tagjaival együtt fel kíván venni a partnerlistájára."
+
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "\"%s\" keresésének eredménye"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti "
-"partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az "
-"alábbi műveletgombokkal."
-
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5531
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az alábbi műveletgombokkal."
+
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "A keresés eredménye"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Nincs találat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-"Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime "
-"közösségben."
-
-#: ../libpurple/protocols/sametime/sametime.c:5562
+msgstr "Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime közösségben."
+
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Nincs találat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Felhasználó keresése"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez "
-"felhasználókat keres a Sametime közösségben."
-
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5606
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez felhasználókat keres a Sametime közösségben."
+
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Felhasználó keresése"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Sametime lista importálása..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Sametime lista exportálása..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Notes címjegyzékcsoport hozzáadása..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Felhasználó keresése..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Bejelentkezés kényszerítése (kiszolgáló átirányítások mellőzése)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Kliens azonosságának elrejtése"
 
@@ -8647,12 +8647,8 @@
 
 #: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a "
-"kulcscserét?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a kulcscserét?"
 
 #: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
@@ -8728,13 +8724,8 @@
 msgstr "%s partner nem megbízható"
 
 #: ../libpurple/protocols/silc/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános "
-"kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal "
-"töltheti le."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal töltheti le."
 
 #. Open file selector to select the public key.
 #: ../libpurple/protocols/silc/buddy.c:1067
@@ -8747,12 +8738,8 @@
 msgstr "%s partner nincs jelen a hálózatban"
 
 #: ../libpurple/protocols/silc/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson "
-"az Importálásra."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson az Importálásra."
 
 #: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
@@ -8763,20 +8750,12 @@
 msgstr "Megfelelő felhasználó kiválasztása"
 
 #: ../libpurple/protocols/silc/buddy.c:1183
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a "
-"partnerlistához adandó megfelelő felhasználót a listából."
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../libpurple/protocols/silc/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"Több felhasználó található ugyanazzal a névvel. Válassza ki a "
-"partnerlistához adandó megfelelő felhasználót a listából."
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "Több felhasználó található ugyanazzal a névvel. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
@@ -9010,18 +8989,8 @@
 msgstr "Csatorna nyilvános kulcsainak listája"
 
 #: ../libpurple/protocols/silc/chat.c:413
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni "
-"védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon "
-"alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete "
-"szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok "
-"a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
 
 #: ../libpurple/protocols/silc/chat.c:422
 #: ../libpurple/protocols/silc/chat.c:423
@@ -9049,9 +9018,7 @@
 #: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr ""
-"Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és "
-"jelmondatát."
+msgstr "Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és jelmondatát."
 
 #: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
@@ -9126,9 +9093,7 @@
 #: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s "
-"csatornához"
+msgstr "Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s csatornához"
 
 #: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
@@ -9153,16 +9118,23 @@
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89
+#: ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96
+#: ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210
+#: ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221
+#: ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Biztonságos fájlátvitel"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:90
+#: ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:101
 #: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Hiba a fájlátvitel közben"
@@ -9199,7 +9171,8 @@
 msgid "Cannot send file"
 msgstr "A fájl nem küldhető el"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:554
+#: ../libpurple/protocols/silc/ops.c:563
 #: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9230,13 +9203,15 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Önt a következőről: <I>%s</I> kirúgta <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:742
+#: ../libpurple/protocols/silc/ops.c:747
 #: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Önt kidobta a következő: %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:773
+#: ../libpurple/protocols/silc/ops.c:778
 #: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
@@ -9416,9 +9391,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1723
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
-"gombra egy új kapcsolat létrehozásához."
+msgstr "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás gombra egy új kapcsolat létrehozásához."
 
 #: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
@@ -9484,12 +9457,8 @@
 
 #: ../libpurple/protocols/silc/pk.c:104
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel "
-"a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
 
 #: ../libpurple/protocols/silc/pk.c:109
 #, c-format
@@ -9509,7 +9478,8 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:116
+#: ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Nyilvános kulcs ellenőrzése"
 
@@ -9567,7 +9537,8 @@
 msgid "Your Current Mood"
 msgstr "Az Ön jelenlegi hangulata"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:660
+#: ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normál"
 
@@ -9623,14 +9594,8 @@
 msgstr "Felhasználó online állapotattribútumai"
 
 #: ../libpurple/protocols/silc/silc.c:739
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és "
-"személyes információit. Kérem töltse ki azokat az információkat, amelyeket "
-"más felhasználók láthatnak Önről."
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és személyes információit. Kérem töltse ki azokat az információkat, amelyeket más felhasználók láthatnak Önről."
 
 #: ../libpurple/protocols/silc/silc.c:780
 #: ../libpurple/protocols/silc/silc.c:786
@@ -9746,9 +9711,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a "
-"hálózaton"
+msgstr "join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a hálózaton"
 
 #: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
@@ -9759,15 +9722,13 @@
 msgstr "whois &lt;becenév&gt;:  A becenévhez tartozó információk megjelenítése"
 
 #: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
 
 #: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a "
-"felhasználónak"
+msgstr "query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a felhasználónak"
 
 #: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
@@ -9779,9 +9740,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
-"quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet "
-"kíséretében"
+msgstr "quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet kíséretében"
 
 #: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
@@ -9789,9 +9748,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó "
-"kidobása"
+msgstr "kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó kidobása"
 
 #: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
@@ -9799,49 +9756,31 @@
 
 #: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
-"whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak "
-"megjelenítése"
+msgstr "whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak megjelenítése"
 
 #: ../libpurple/protocols/silc/silc.c:1656
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna "
-"üzemmódjainak megjelenítése vagy megváltoztatása"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna üzemmódjainak megjelenítése vagy megváltoztatása"
 
 #: ../libpurple/protocols/silc/silc.c:1660
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév "
-"módjainak megváltoztatása a csatornán"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév módjainak megváltoztatása a csatornán"
 
 #: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a "
-"hálózaton"
+msgstr "umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a hálózaton"
 
 #: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;becenév&gt; [-pubkey]:  Kiszolgáló-operátori jogok kérése"
 
 #: ../libpurple/protocols/silc/silc.c:1672
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó "
-"meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
 
 #: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a "
-"csatornáról"
+msgstr "kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a csatornáról"
 
 #: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
@@ -9853,9 +9792,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános "
-"kulcsának letöltése"
+msgstr "getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános kulcsának letöltése"
 
 #: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
@@ -9870,12 +9807,8 @@
 msgstr "users &lt;csatorna&gt;:  Egy csatorna felhasználóit listázza ki"
 
 #: ../libpurple/protocols/silc/silc.c:1705
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A "
-"csatorna/csatornák bizonyos felhasználóinak listázása"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A csatorna/csatornák bizonyos felhasználóinak listázása"
 
 #. *< type
 #. *< ui_requirement
@@ -9886,64 +9819,65 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokollbővítmény"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1818
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1844 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1862
+#: ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Nyilvános kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Személyes kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:1869
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Titkosító"
 
-#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1882
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Nyilvános kulcs hitelesítése"
 
-#: ../libpurple/protocols/silc/silc.c:1885
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Más felhasználók nem láthatnak"
 
-#: ../libpurple/protocols/silc/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Meghívások tiltása"
 
-#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Kulcscsere nélküli azonnali üzenetváltások tiltása"
 
-#: ../libpurple/protocols/silc/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Online állapotattribútum-kérések visszautasítása"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "Üzenetek tiltása a rajzlapra"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "Rajzlap automatikus megnyitása"
 
-#: ../libpurple/protocols/silc/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 
@@ -10047,12 +9981,8 @@
 
 #: ../libpurple/protocols/silc/wb.c:288
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-"%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a "
-"rajzlapot?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a rajzlapot?"
 
 #: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
@@ -10064,26 +9994,26 @@
 msgstr "Nem sikerült az írás"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "Nem sikerült létrehozni a figyelő foglalatot"
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Nem sikerült a kiszolgáló feloldása"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "A gépnév nem oldható fel"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "A SIP felhasználónevek nem tartalmazhatnak szóközt vagy @ szimbólumot"
 
@@ -10095,36 +10025,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokollbővítmény"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "A SIP/SIMPLE protokollbővítmény"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Állapot közzététele (megjegyzés: mindenki figyelheti)"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "UDP használata"
 
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "Proxy használata"
+
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "Proxy használata"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "Felhasználó hitelesítése"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "Tartomány hitelesítése"
 
@@ -10190,9 +10120,7 @@
 #: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan "
-"küldte."
+msgstr "Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan küldte."
 
 #: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
@@ -10248,12 +10176,8 @@
 msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez."
 
 #: ../libpurple/protocols/toc/toc.c:558
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha "
-"tovább folytatja, akkor még tovább kell majd várnia."
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha tovább folytatja, akkor még tovább kell majd várnia."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10306,8 +10230,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Az átvitelhez nem sikerült a kapcsolatot létrehozni."
 
@@ -10341,7 +10267,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokollbővítmény"
 
@@ -10354,204 +10281,186 @@
 msgid "%s just sent you a Buzz!"
 msgstr "%s egy bökést küldött!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! rendszerüzenet %s számára:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "Hozzáférés elutasítva üzenet:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
-"közé."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
-"közé, a következő magyarázattal: %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé, a következő magyarázattal: %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "Partner felvétele megtagadva"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. Valószínűleg nem fog tudni sikeresen bejelentkezni. Keressen esetleges frissítéseket a következő helyen: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! hitelesítés sikertelen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"Megpróbálta mellőzni %s felhasználót, de ő rajta van a partnerlistáján. Ha "
-"az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a "
-"felhasználót."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#, c-format
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "Megpróbálta mellőzni %s felhasználót, de ő rajta van a partnerlistáján. Ha az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a felhasználót."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "Mellőzi a partnert?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "A fiókja zárolva van, kérem jelentkezzen be a Yahoo! weboldalára."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán "
-"megoldhatja ezt a problémát."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+msgstr "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán megoldhatja ezt a problémát."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
-"tartozó kiszolgálóoldali listán."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+msgstr "Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz tartozó kiszolgálóoldali listán."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hallható %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Kapcsolathiba"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Not at Desk"
 msgstr "Nem vagyok az asztalnál"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "Nem vagyok a munkahelyemen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "Nyaralok"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "Kilépett"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "Belépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "Jelenlét"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "Kilépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne látsszon tartósan kilépettként"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "Csatlakozás a csevegéshez"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "Konferencia kezdeményezése"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "Jelenlét beállításai"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "Firkálás megkezdése"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "Melyik azonosítót aktiválja?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "Kihez csatlakozik a csevegésben?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "Azonosító aktiválása..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "Felhasználó csatlakoztatása csevegéshez..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Csatornák listázása a Yahoo hálózatán"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3830
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Csatornák listázása a Yahoo hálózatán"
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3834
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
 
@@ -10565,65 +10474,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokollbővítmény"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "Személyhívó kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "Japán személyhívó kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "Személyhívó Port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "Fájlátviteli kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "Japán fájlátviteli kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "Fájlátviteli port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "Csevegőszoba nyelve"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "Csevegőszobák listájának URL címe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo csevegőkiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo csevegőport"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%"
-"s\"."
+msgstr "%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%s\"."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
@@ -10649,12 +10556,8 @@
 msgstr "Nem érhető el"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, "
-"mielőtt újra csatlakozhatna a csevegőszobához"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, mielőtt újra csatlakozhatna a csevegőszobához"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -10718,20 +10621,12 @@
 msgstr "Yahoo! profil"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:814
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt "
-"profilok jelenleg nem támogatottak."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt profilok jelenleg nem támogatottak."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:816
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia "
-"a böngészőjében:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr "Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia a böngészőjében:"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
@@ -10774,31 +10669,16 @@
 msgstr "%s felhasználói információi nem érhetőek el"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr ""
-"Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg "
-"nem támogatott."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg nem támogatott."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti "
-"kiszolgálóoldali hiba, kérem próbálja újra később."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti kiszolgálóoldali hiba, kérem próbálja újra később."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, "
-"hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a "
-"felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem "
-"próbálkozzon újra később."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem próbálkozzon újra később."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
@@ -10818,12 +10698,8 @@
 "%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" "
-"beállításait a Fiókszerkesztőben)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" beállításait a Fiókszerkesztőben)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -10831,110 +10707,92 @@
 msgstr "Nem lehet a(z) %s,%s,%s csevegésbe küldeni"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Felhasználó"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Láthatatlan vagy nincs bejelentkezve"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ennél: %s %s óta"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Bárki"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Osztály:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Példány:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Címzett:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "A feliratkozási kísérlet a következőre: %s,%s,%s sikertelen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;becenév&gt;: Felhasználó keresése"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;becenév&gt;: Felhasználó keresése"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új "
-"csevegéshez"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+msgstr "sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új csevegéshez"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,"
-"*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;"
-"<i>osztály</i>,<i>példány</i>,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a "
-"következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;"
-"ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+msgstr "zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,"
-"SZEMÉLY,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+msgstr "zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,SZEMÉLY,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Ismételt feliratkozás"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Feliratkozások lekérése a kiszolgálótól"
 
@@ -10948,44 +10806,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokollbővítmény"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "tzc használata"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc parancs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Exportálás .anyone-ba"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Exportálás .zephyr.subs-ba"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importálás .anyone-ból"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importálás .zephyr.subs-ból"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Tartomány"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exportálás"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:458
+#: ../libpurple/proxy.c:877
+#: ../libpurple/proxy.c:1032
 #: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
@@ -11000,7 +10860,9 @@
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:686
+#: ../libpurple/proxy.c:732
+#: ../libpurple/proxy.c:770
 #: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -11009,9 +10871,7 @@
 #: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
-"d. porton."
+msgstr "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %d. porton."
 
 #: ../libpurple/proxy.c:995
 #, c-format
@@ -11051,12 +10911,12 @@
 msgid "saved statuses"
 msgstr "mentett állapotok"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s neve ezentúl %s néven szerepel.\n"
-
-#: ../libpurple/server.c:670
+msgstr "%s ezentúl %s néven szerepel.\n"
+
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11065,58 +10925,58 @@
 "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "Elfogadja a meghívást a csevegésre?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Visszaállítás"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Nem érhető el"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s megváltoztatta az állapotát (%s -> %s)"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ezentúl %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s már nem %s"
 
-#: ../libpurple/status.c:1288
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s inaktív lett"
 
-#: ../libpurple/status.c:1305
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s már nem inaktív"
 
-#: ../libpurple/status.c:1371
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s inaktív lett"
 
-#: ../libpurple/status.c:1373
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s már nem inaktív"
@@ -11126,95 +10986,88 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "Hiba %s olvasásakor"
 
-#: ../libpurple/util.c:2496
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a "
-"régi fájl %s~ néven lett elmentve."
-
-#: ../libpurple/util.c:2980
+#: ../libpurple/util.c:2554
+#, c-format
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a régi fájl %s~ néven lett elmentve."
+
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "Számítás..."
 
-#: ../libpurple/util.c:2983
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "Ismeretlen."
 
-#: ../libpurple/util.c:3009
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d másodperc"
 msgstr[1] "%d másodperc"
 
-#: ../libpurple/util.c:3021
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d nap"
 msgstr[1] "%d nap"
 
-#: ../libpurple/util.c:3029
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d óra"
 msgstr[1] "%s, %d óra"
 
-#: ../libpurple/util.c:3035
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: ../libpurple/util.c:3043
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d perc"
 msgstr[1] "%s, %d perc"
 
-#: ../libpurple/util.c:3049
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
+#: ../libpurple/util.c:3362
+#: ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nem lehet csatlakozni a következőhöz: %s"
 
-#: ../libpurple/util.c:3441
-#, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. "
-"Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
-
-#: ../libpurple/util.c:3476
+#: ../libpurple/util.c:3488
+#, c-format
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
+
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Hiba %s olvasása közben: %s"
 
-#: ../libpurple/util.c:3507
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Hiba %s írása közben: %s"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nem lehet a következőhöz kapcsolódni: %s: %s"
@@ -11240,55 +11093,56 @@
 msgstr "A tálca tájolása."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "Bejelentkezés beállításai"
 
-#: ../pidgin/gtkaccount.c:500
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "Helyi álnév:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "Felhasználói beállítások"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "Ezen partnerikon használata a fiókhoz:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s beállításai"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME proxybeállítások használata"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "Globális proxybeállítások használata"
 
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "Nincs Proxy"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Környezeti beállítások használata"
 
@@ -11297,308 +11151,316 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "ha igazán közelről nézi"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "láthatja a pillangók nászát"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "Proxy beállításai"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020
+#: ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "Proxy _típusa:"
 
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029
+#: ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Gépnév:"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "_Felhasználó:"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048
+#: ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "Jel_szó:"
 
-#: ../pidgin/gtkaccount.c:1440
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "Fiók hozzáadása"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "_Alap"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "_Haladó"
 
-#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "Protokoll"
 
 # fixme: üdvözli a %s az {pidgin | finch} lehet, nemde?
-#: ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
 "\n"
 "Nincsenek beállítva azonnaliüzenő-fiókjai. A %s használatának megkezdéséhez kattintson az alábbi <b>Hozzáadás</b> gombra és állítsa be első fiókját. Ha azt szeretné hogy a %s több fiókhoz csatlakozzon, kattintson újra a <b>Hozzáadás</b> gombra és állítsa be mindet.\n"
 "\n"
-"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, "
-"szerkesztéséhez vagy eltávolításához."
-
-#: ../pidgin/gtkblist.c:722
+"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, szerkesztéséhez vagy eltávolításához."
+
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "Csatlakozás egy csevegéshez"
 
-#: ../pidgin/gtkblist.c:743
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez "
-"csatlakozni kíván.\n"
-
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkblist.c:745
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez csatlakozni kíván.\n"
+
+#: ../pidgin/gtkblist.c:756
+#: ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "F_iók:"
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Tiltás"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "_Tiltás feloldása"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "_Info"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+#: ../pidgin/gtkblist.c:1099
+#: ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "Ü_zenet"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "_Fájl küldése"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "_Partnerfigyelmeztetés felvétele"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1204 ../pidgin/gtkblist.c:1227
+#: ../pidgin/gtkblist.c:1116
+#: ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222
+#: ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "Álnév..."
 
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1212
-#: ../pidgin/gtkblist.c:1233
+#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "Ál_név..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1214
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1143
+#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "P_artner felvétele"
 
-#: ../pidgin/gtkblist.c:1177
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "_Csevegés felvétele"
 
-#: ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "_Csoport törlése"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
 #. join button
-#: ../pidgin/gtkblist.c:1200 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1218
+#: ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463
+#: ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../pidgin/gtkblist.c:1202
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "Automatikus csatlakozás"
 
-#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1263
+#: ../pidgin/gtkblist.c:1258
+#: ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "Összecs_ukás"
 
-#: ../pidgin/gtkblist.c:1268
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "_Kibontás"
 
-#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1525
-#: ../pidgin/gtkblist.c:4491 ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:1531
+#: ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511
+#: ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/Eszközök/Hangok némítása"
 
-#: ../pidgin/gtkblist.c:1985 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:2003
+#: ../pidgin/gtkconv.c:4535
 #: ../pidgin/gtkpounce.c:423
 msgid "You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
-"partnert."
+msgstr "Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a partnert."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2813
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/_Partnerek"
 
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Partnerek/Új azonnal_i üzenet..."
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Partnerek/_Csatlakozás csevegéshez..."
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/Partnerek/_Felhasználó adatainak lekérése..."
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/Partnerek/Felhasználó _naplójának lekérése..."
 
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Partnerek/Ki_lépett partnerek megjelenítése"
 
-#: ../pidgin/gtkblist.c:2820
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Partnerek/Ür_es csoportok megjelenítése"
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Partnerek/_Partner részleteinek megjelenítése"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Partnerek/Inaktív i_dők megjelenítése"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Partnerek/Part_nerek rendezése"
 
-#: ../pidgin/gtkblist.c:2825
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Partnerek/_Partner felvétele..."
 
-#: ../pidgin/gtkblist.c:2826
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/Partnerek/Cse_vegés felvétele..."
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/Partnerek/C_soport felvétele..."
 
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/Partnerek/_Kilépés"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/_Fiókok"
 
-#: ../pidgin/gtkblist.c:2833 ../pidgin/gtkblist.c:6414
+#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Fiókok/Hozzáadás\\/Szerkesztés"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: ../pidgin/gtkblist.c:2837
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Eszközök/_Partnerfigyelmeztetések"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/Eszközök/Bő_vítmények"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/Eszközök/_Beállítások"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/Eszközök/_Szobalista"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/Eszközök/_Rendszernapló"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/Eszközök/_Hangok némítása"
 
 #. Help
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "/Súgó/Online _súgó"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/Súgó/_Hibakereső ablak"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/Súgó/_Névjegy"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11607,234 +11469,217 @@
 "\n"
 "<b>Fiók:</b> %s"
 
-#: ../pidgin/gtkblist.c:2958
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "Partnerálnév"
 
-#: ../pidgin/gtkblist.c:2979
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "Bejelentkezve"
 
-#: ../pidgin/gtkblist.c:3025
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "Utoljára látszott"
 
-#: ../pidgin/gtkblist.c:3045
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "Idegroncs"
 
-#: ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "Szuper"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "Király"
 
-#: ../pidgin/gtkblist.c:3374
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inaktív (%d ó %02d p)"
 
-#: ../pidgin/gtkblist.c:3376
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "Inaktív (%d p)"
 
-#: ../pidgin/gtkblist.c:3513
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/Partnerek/Új azonnali üzenet..."
 
-#: ../pidgin/gtkblist.c:3514 ../pidgin/gtkblist.c:3547
+#: ../pidgin/gtkblist.c:3534
+#: ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/Partnerek/Csatlakozás csevegéshez..."
 
-#: ../pidgin/gtkblist.c:3515
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/Partnerek/Felhasználó adatainak lekérése..."
 
-#: ../pidgin/gtkblist.c:3516
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/Partnerek/Partner felvétele..."
 
-#: ../pidgin/gtkblist.c:3517 ../pidgin/gtkblist.c:3550
+#: ../pidgin/gtkblist.c:3537
+#: ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/Partnerek/Csevegés felvétele..."
 
-#: ../pidgin/gtkblist.c:3518
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/Partnerek/Csoport felvétele..."
 
-#: ../pidgin/gtkblist.c:3553
-msgid "/Tools/Buddy Pounces"
-msgstr "/Eszközök/Partnerfigyelmeztetések"
-
-#: ../pidgin/gtkblist.c:3556
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/Eszközök/Magánszféra"
 
-#: ../pidgin/gtkblist.c:3559
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/Eszközök/Szobalista"
 
-#: ../pidgin/gtkblist.c:3656 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3673
+#: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d olvasatlan üzenet %s partnertől\n"
 msgstr[1] "%d olvasatlan üzenet %s partnertől\n"
 
-#: ../pidgin/gtkblist.c:3733
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "Kézi"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "ABC sorrend"
 
-#: ../pidgin/gtkblist.c:3736
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "Állapot szerint"
 
-#: ../pidgin/gtkblist.c:3737
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "Napló mérete szerint"
 
-#: ../pidgin/gtkblist.c:3939 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956
+#: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bontotta a kapcsolatot"
 
-#: ../pidgin/gtkblist.c:3949
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "Fiók újraengedélyezése"
 
-#: ../pidgin/gtkblist.c:3970
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s bontotta a kapcsolatot: %s</span>"
 
-#: ../pidgin/gtkblist.c:4123
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>Felhasználónév:</b>"
 
-#: ../pidgin/gtkblist.c:4130
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>Jelszó:</b>"
 
-#: ../pidgin/gtkblist.c:4141
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "_Bejelentkezés"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/Fiókok"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4240
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
 "\n"
-"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/"
-"Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő "
-"fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát "
-"és cseveghet barátaival."
+"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát és cseveghet barátaival."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Partnerek/Kilépett partnerek megjelenítése"
 
-#: ../pidgin/gtkblist.c:4488
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Partnerek/Üres csoportok megjelenítése"
 
-#: ../pidgin/gtkblist.c:4494
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Partnerek/Partner részleteinek megjelenítése"
 
-#: ../pidgin/gtkblist.c:4497
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/Partnerek/Inaktivitási idők megjelenítése"
 
-#: ../pidgin/gtkblist.c:5335
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat "
-"egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett "
-"kerül megjelenítésre, amennyiben az lehetséges.\n"
-
-#: ../pidgin/gtkblist.c:5395 ../pidgin/gtkblist.c:5756
+#: ../pidgin/gtkblist.c:5367
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett kerül megjelenítésre, amennyiben az lehetséges.\n"
+
+#: ../pidgin/gtkblist.c:5427
+#: ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Csoport:"
 
-#: ../pidgin/gtkblist.c:5654
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
 
-#: ../pidgin/gtkblist.c:5670
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas "
-"lenne."
-
-#: ../pidgin/gtkblist.c:5711
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni "
-"kívánt csevegésről.\n"
-
-#: ../pidgin/gtkblist.c:5794
+#: ../pidgin/gtkblist.c:5702
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas lenne."
+
+#: ../pidgin/gtkblist.c:5743
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni kívánt csevegésről.\n"
+
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "Kérem adja meg a felvenni kívánt csoport nevét."
 
-#: ../pidgin/gtkblist.c:6434
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Fiókok/"
 
-#: ../pidgin/gtkblist.c:6458
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "_Fiók szerkesztése"
 
-#: ../pidgin/gtkblist.c:6471 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6503
+#: ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "Nem állnak rendelkezésre műveletek"
 
-#: ../pidgin/gtkblist.c:6479
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "_Tiltás"
 
-#: ../pidgin/gtkblist.c:6491
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "Fiók engedélyezése"
 
-#: ../pidgin/gtkblist.c:6497
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Fiókok/Fiók engedélyezése"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/Eszközök"
 
-#: ../pidgin/gtkblist.c:6616
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/Partnerek/Partnerek rendezése"
 
@@ -11843,215 +11688,214 @@
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
+"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a "
-"hibát és nem engedélyezi újra a fiókot."
-
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a hibát és nem engedélyezi újra a fiókot."
+
+#: ../pidgin/gtkconv.c:788
+#: ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "A partner nem ugyanazt a protokollt használja, mint ez a csevegés"
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
-"partnert."
-
-#: ../pidgin/gtkconv.c:855
+msgstr "Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a partnert."
+
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "Partner meghívása a csevegőszobába"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
-"tetszőleges meghívóüzenettel együtt."
-
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:891
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy tetszőleges meghívóüzenettel együtt."
+
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "_Partner:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtkconv.c:932
+#: ../pidgin/gtksavedstatuses.c:1142
 #: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "Ü_zenet:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:2499
+#: ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Nem lehet megnyitni a fájlt."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Társalgás %s partnerrel</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "Társalgás mentése"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1180
+#: ../pidgin/gtkdebug.c:165
+#: ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "Keresés"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206
+#: ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Kere_sés:"
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1366
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "Mellőzés visszavonása"
 
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "Mellőzés"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "Távollét üzenet lekérdezése"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "Utoljára ezt mondta"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "Nem menthető lemezre az ikonfájl."
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "Ikon mentése"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "Animálás"
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "Ikon elrejtése"
 
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "Ikon mentése másként..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "Egyéni ikon beállítása..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "Egyéni ikon eltávolítása"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/_Társalgás"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Társalgás/Új azonnali ü_zenet..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/Társalgás/Ker_esés..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/Társalgás/Nap_ló megtekintése"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/Társalgás/_Mentés másként..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Társalgás/Elő_zmények törlése"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/Se_nd File..."
 msgstr "/Társalgás/Fájl kül_dése..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/Társalgás/_Információ lekérése"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/Társalgás/Me_ghívás..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/Társalgás/_Több"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/Társalgás/Ál_név..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/Társalgás/_Tiltás..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/Társalgás/_Tiltás feloldása..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/Társalgás/_Hozzáadás..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/Társalgás/_Eltávolítás..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/Társalgás/_Bezárás"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/_Beállítások"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/Beállítások/_Naplózás engedélyezése"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/Beállítások/_Hangok engedélyezése"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Beállítások/_Partnerikonok megjelenítése"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Beállítások/_Formázás eszköztárak mutatása"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Beállítások/I_dőbélyegek mutatása"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/Társalgás/Több"
 
@@ -12060,238 +11904,253 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:2947
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/Társalgás"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/Társalgás/Napló megtekintése"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/Társalgás/Fájl küldése..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Társalgás/Partnerfigyelmeztetés felvétele..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/Társalgás/Információ lekérése"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/Társalgás/Meghívás..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/Társalgás/Álnév..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/Társalgás/Tiltás..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/Társalgás/Tiltás feloldása..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/Társalgás/Hozzáadás..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/Társalgás/Eltávolítás..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/Beállítások/Naplózás engedélyezése"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/Beállítások/Hangok engedélyezése"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Beállítások/Formázás eszköztárak mutatása"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/Beállítások/Időbélyegek mutatása"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/Beállítások/Partnerikon megjelenítése"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
 msgstr "A felhasználó gépel..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
 msgstr "A felhasználó gépelt valamit és megállt"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "_Küldés mint"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "0 személy tartózkodik a szobában"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5421
+#: ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d személy van a szobában"
 msgstr[1] "%d személy van a szobában"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6108
+#: ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Gépel"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "Abbahagyta a gépelést"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "Becenév kimondva"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:509
+#: ../pidgin/gtkconv.c:6124
+#: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Olvasatlan üzenetek"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "Új esemény"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "Bezárás jóváhagyása"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Olvasatlan üzenetei vannak. Biztos, hogy bezárja az ablakot?"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "Más lapok bezárása"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "Minden lap bezárása"
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "Ezen lap leválasztása"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "Ezen lap bezárása"
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "Társalgás bezárása"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "Utoljára létrehozott ablak"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "Üzenő- és csevegőablakok elkülönítése"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736
+#: ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "Új ablak"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "Csoport szerint"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "Fiók szerint"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Hibakereső napló mentése"
 
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "Invertálás"
 
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "Találatok kiemelése"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "Csak i_kon"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "Csak s_zöveg"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "Ik_on és szöveg"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "Szűrő"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "Kattintson a jobb egérgombbal további beállításokért."
 
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "Szint: "
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "Válassza ki a hibakeresési szűrő szintjét."
 
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "Minden"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "Egyéb"
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "Hiba "
 
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "Végzetes hiba"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "vezető fejlesztő"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 #: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "fejlesztő"
@@ -12312,7 +12171,8 @@
 msgid "win32 port"
 msgstr "win32 portolás"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "karbantartó"
 
@@ -12326,8 +12186,8 @@
 msgstr "hacker és kijelölt vezető"
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber fejlesztő"
+msgid "XMPP developer"
+msgstr "XMPP fejlesztő"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
@@ -12341,13 +12201,16 @@
 msgid "Arabic"
 msgstr "Arab"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:125
+#: ../pidgin/gtkdialogs.c:126
 #: ../pidgin/gtkdialogs.c:209
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:127
+#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "Bengáli"
 
@@ -12355,34 +12218,41 @@
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:210
 #: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "Katalán"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "Valenciai katalán"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "Cseh"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "Dán"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 #: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "Német"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
 #: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "Görög"
 
@@ -12402,28 +12272,35 @@
 msgid "Esperanto"
 msgstr "Eszperantó"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 #: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "Baszk"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 #: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:218
 #: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:222
 #: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "Francia"
@@ -12432,11 +12309,17 @@
 msgid "Galician"
 msgstr "Galíciai"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "Gudzsarati fordítócsapat"
+
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "Héber"
 
@@ -12452,33 +12335,48 @@
 msgid "Indonesian"
 msgstr "Indonéz"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "Grúz"
 
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Grúz Ubuntu fordítók"
+
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "Kannada fordítócsapat"
+
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "Koreai"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "Kurd"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "Litván"
@@ -12503,8 +12401,10 @@
 msgid "Norwegian"
 msgstr "Norvég"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "Lengyel"
 
@@ -12524,18 +12424,22 @@
 msgid "Romanian"
 msgstr "Román"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:234
 #: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 #: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "Szlovén"
 
@@ -12543,11 +12447,13 @@
 msgid "Albanian"
 msgstr "Albán"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "Szerb"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "Svéd"
 
@@ -12575,15 +12481,18 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh és a Gnome-Vi csapat"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "Egyszerűsített kínai"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Hong Kong Chinese"
 msgstr "Hongkongi kínai"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 #: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
@@ -12597,226 +12506,180 @@
 msgid "About %s"
 msgstr "A %s névjegye"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"A %s egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
-"SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
-"Gadu és QQ protokollok egyidejű használatának képességével. A Gtk+ "
-"használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot "
-"terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában "
-"foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett "
-"\"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek "
-"teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk "
-"garanciát.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "A %s egy libpurple alapú moduláris üzenetküldő kliens AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu és QQ protokollok egyidejű használatának lehetőségével. A Gtk+ használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett \"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk garanciát.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 az irc.freenode.net hálózaton<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin az irc.freenode.net hálózaton<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "Jelenlegi fejlesztők"
 
-#: ../pidgin/gtkdialogs.c:402
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "Őrült patch szerzők"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "Visszavonult fejlesztők"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
 msgstr "Grafikusok"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "Jelenlegi fordítók"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "Korábbi fordítók"
 
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "Hibakeresési információk"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "Felhasználó adatainak lekérése"
 
-#: ../pidgin/gtkdialogs.c:856
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg "
-"szeretné tekinteni."
-
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:859
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg szeretné tekinteni."
+
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "Felhasználó naplójának lekérése"
 
-#: ../pidgin/gtkdialogs.c:948
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg "
-"szeretné tekinteni."
-
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:951
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg szeretné tekinteni."
+
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "Kapcsolat álneve"
 
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "Adjon meg egy álnevet ehhez a kapcsolathoz."
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Adjon meg egy álnevet %s számára."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "Partner álneve"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "Csevegés álneve"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "Adjon meg egy álnevet ehhez a csevegéshez."
 
-#: ../pidgin/gtkdialogs.c:1054
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-msgstr[1] ""
-"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1057
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+msgstr[1] "%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "Kapcsolat eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "_Kapcsolat eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1096
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. "
-"Folytatni akarja?"
-
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1099
+#, c-format
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "Csoportok összefésülése"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "_Csoportok összefésülése"
 
-#: ../pidgin/gtkdialogs.c:1156
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"A(z) %s csoport és annak összes tagja eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-
 #: ../pidgin/gtkdialogs.c:1159
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "A(z) %s csoport és annak összes tagja eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "Csoport törlése"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "_Csoport eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "Partner törlése"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "Partner _törlése"
 
-#: ../pidgin/gtkdialogs.c:1222
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+#: ../pidgin/gtkdialogs.c:1225
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "Csevegés eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "_Csevegés eltávolítása"
 
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal...\n"
 
-#: ../pidgin/gtkdocklet.c:452
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Állapot megváltoztatása"
 
-#: ../pidgin/gtkdocklet.c:504
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Partnerlista mutatása"
 
-#: ../pidgin/gtkdocklet.c:530
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Új üzenet..."
 
-#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Hangok némítása"
 
-#: ../pidgin/gtkdocklet.c:552
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Villogjon új üzenetkor"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:563
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -12897,7 +12760,8 @@
 msgstr "Fájlát_vitel részletei"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkft.c:835
+#: ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Szünet"
 
@@ -12942,7 +12806,7 @@
 msgid "_Copy Link Location"
 msgstr "_Hivatkozás helyének másolása"
 
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12952,7 +12816,7 @@
 "\n"
 "Alapértelmezett PNG használata."
 
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12962,7 +12826,7 @@
 "\n"
 "Alapértelmezett PNG használata."
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12973,7 +12837,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12984,11 +12848,12 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3310
+#: ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "Kép mentése"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "Kép menté_se..."
 
@@ -13013,12 +12878,8 @@
 msgstr "_Leírás"
 
 #: ../pidgin/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás "
-"opcionális."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás opcionális."
 
 #: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
@@ -13037,7 +12898,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "A kép tárolása nem sikerült: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:513
+#: ../pidgin/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Kép beszúrása"
 
@@ -13050,15 +12912,18 @@
 msgid "Smile!"
 msgstr "Hangulatjel választása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:922
+#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Félkövér"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:933
+#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Dőlt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:944
+#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Aláhúzott"
 
@@ -13100,23 +12965,17 @@
 
 #: ../pidgin/gtklog.c:267
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s partnerrel folytatott, %s időpontban kezdődött beszélgetés naplóját?"
 
 #: ../pidgin/gtklog.c:278
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban kezdődött beszélgetés naplóját?"
 
 #: ../pidgin/gtklog.c:283
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
 
 #: ../pidgin/gtklog.c:427
@@ -13134,26 +12993,16 @@
 msgstr "%Y %B"
 
 #: ../pidgin/gtklog.c:524
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes "
-"állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
 
 #: ../pidgin/gtklog.c:528
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali "
-"üzenet naplózása\" tulajdonság be van állítva."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali üzenet naplózása\" tulajdonság be van állítva."
 
 #: ../pidgin/gtklog.c:531
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása"
-"\" tulajdonság be van állítva."
+msgstr "A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása\" tulajdonság be van állítva."
 
 #: ../pidgin/gtklog.c:535
 msgid "No logs were found"
@@ -13173,7 +13022,8 @@
 msgid "Conversations in %s"
 msgstr "Társalgások ezen: %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:691
+#: ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "Társalgások a következővel: %s"
@@ -13182,12 +13032,12 @@
 msgid "System Log"
 msgstr "Rendszernapló"
 
-#: ../pidgin/gtkmain.c:372
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Próbálja a \"%s -h\" parancsot további információkért.\n"
 
-#: ../pidgin/gtkmain.c:374
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13212,44 +13062,44 @@
 "                      használandó fiókok vesszőkkel tagolt listáját)\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#: ../pidgin/gtkmain.c:497
+#: ../pidgin/gtkmain.c:493
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "A %s összeomlott és megpróbált kiírni egy magfájlt.\n"
 "Ez a szoftver és nem az Ön hibája miatt történt.\n"
 "\n"
 "Ha ismételten elő tudja állítani az összeomlást, akkor\n"
 "értesítse a Pidgin fejlesztőit a következő címen:\n"
-"%sbug.php\n"
+"%snewticket/\n"
 "\n"
 "Győződjön meg róla, hogy megadta, mit csinált az összeomlás előtt,\n"
 "és küldje be a visszakövetésből származó magfájlt. Ha nem tudja, hogyan\n"
 "szerezze be a visszakövetést, akkor olvassa el a következő címen található\n"
 "utasításokat:\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
-"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (angolul)\n"
+"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (AIM protokollon, angolul)\n"
 "SeanEgn-nak vagy LSchiere-nek. Sean és Luke kapcsolatinformációi más\n"
 "protokollokhoz elérhetők a következő oldalon:\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 
 #: ../pidgin/gtknotify.c:337
 msgid "Open All Messages"
@@ -13277,22 +13127,25 @@
 msgstr[0] "<b>%d új e-mailje érkezett.</b>"
 msgstr[1] "<b>%d új e-mailje érkezett.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "A(z) \"%s\" böngészőparancs érvénytelen."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953
+#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978
+#: ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "Az URL megnyitása sikertelen"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963
+#: ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Hiba \"%s\" indításakor: %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "A \"Kézi\" böngészőparancsot választotta, de nem adott meg parancsot."
 
@@ -13440,12 +13293,8 @@
 msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
 
 #: ../pidgin/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
-"témák a témalistába dobással telepíthetők."
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új témák a témalistába dobással telepíthetők."
 
 #: ../pidgin/gtkprefs.c:673
 msgid "Icon"
@@ -13459,7 +13308,9 @@
 msgid "_Show system tray icon:"
 msgstr "_Rendszertálca-ikon megjelenítése:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819
+#: ../pidgin/gtkprefs.c:831
+#: ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13478,7 +13329,8 @@
 msgid "_Hide new IM conversations:"
 msgstr "Új társal_gások elrejtése:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830
+#: ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "Ha távol vagyok"
 
@@ -13560,12 +13412,8 @@
 msgstr "Alapértelmezett formázás"
 
 #: ../pidgin/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, "
-"amelyek támogatják a formázást. :)"
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, amelyek támogatják a formázást. :)"
 
 #: ../pidgin/gtkprefs.c:1017
 msgid "ST_UN server:"
@@ -13704,6 +13552,12 @@
 msgid "Log all _status changes to system log"
 msgstr "Összes állapot_változás naplózása a rendszernaplóba"
 
+#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(alapértelmezett)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Hang kiválasztása"
@@ -13912,7 +13766,8 @@
 msgid "Set privacy for:"
 msgstr "Magánszféra beállításai ehhez:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:560
+#: ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "Felhasználó engedélyezése"
 
@@ -13922,11 +13777,10 @@
 
 #: ../pidgin/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy "
-"kapcsolatba lépjen Önnel."
-
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgstr "Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy kapcsolatba lépjen Önnel."
+
+#: ../pidgin/gtkprivacy.c:565
+#: ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "_Engedélyezés"
 
@@ -13940,7 +13794,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Biztosan megengedi, hogy %s kapcsolatba lépjen Önnel?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Felhasználó tiltása"
 
@@ -13980,9 +13835,10 @@
 
 #: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
-msgstr "Válasszon új nevet"
-
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgstr "Új név választása"
+
+#: ../pidgin/gtkrequest.c:1624
+#: ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "Válasszon mappát..."
 
@@ -14005,7 +13861,8 @@
 msgstr "Biztos, hogy törölni akarja a kijelölt mentett állapotokat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580
+#: ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "_Használat"
 
@@ -14021,7 +13878,8 @@
 msgid "_Title:"
 msgstr "_Cím:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1126
+#: ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "Áll_apot:"
 
@@ -14092,92 +13950,82 @@
 msgid "Waiting for network connection"
 msgstr "Várakozás a hálózati kapcsolatra"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372
+#: ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "A következő hiba történt %s betöltése közben: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375
+#: ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "A kép betöltése meghiúsult"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "A(z) %s mappa nem küldhető el."
 
-#: ../pidgin/gtkutils.c:1420
-#, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"A %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat "
-"egyenként kell elküldenie."
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1472
+#, c-format
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr "A(z) %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat egyenként kell elküldenie."
+
+#: ../pidgin/gtkutils.c:1504
+#: ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "Egy képet húzott be"
 
-#: ../pidgin/gtkutils.c:1453
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy "
-"használhatja ezen felhasználó partnerikonjaként."
-
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1505
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1511
+#: ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "Beállítás partnerikonként"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1512
+#: ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "Képfájl küldése"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1513
+#: ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "Beszúrás az üzenetbe"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Be kívánja állítani partnerikonként ehhez a felhasználóhoz?"
 
-#: ../pidgin/gtkutils.c:1472
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy "
-"használhatja ezen felhasználó partnerikonjaként."
-
-#: ../pidgin/gtkutils.c:1474
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
-"partnerikonjaként."
+#: ../pidgin/gtkutils.c:1524
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1526
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó partnerikonjaként."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "Az indítóikon nem küldhető el"
 
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
-"objektumot akarta elküldeni az indítóikon helyett."
-
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:1584
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott objektumot akarta elküldeni az indítóikon helyett."
+
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14188,32 +14036,31 @@
 "<b>Fájlméret:</b> %s\n"
 "<b>Képméret:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "A(z) \"%s\" fájl túl nagy a következőhöz: %s. Próbálkozzon kisebb képpel.\n"
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Ikonhiba"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Az ikon beállítása meghiúsult"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nem sikerült megnyitni a(z) \"%s\" fájlt: %s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült "
-"a képfájl"
-
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgstr "A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült a képfájl"
+
+#: ../pidgin/gtkwhiteboard.c:760
+#: ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "Fájl mentése"
 
@@ -14221,27 +14068,33 @@
 msgid "Select color"
 msgstr "Szín kiválasztása"
 
-#: ../pidgin/pidginstock.c:83
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Ál_név"
 
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "_Lapok bezárása"
+
 #: ../pidgin/pidginstock.c:85
-msgid "Close _tabs"
-msgstr "_Lapok bezárása"
-
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "Információ le_kérése"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "Meg_hívás"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Módosítás"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Levél megnyitása"
 
@@ -14249,7 +14102,8 @@
 msgid "Display Statistics"
 msgstr "Statisztikák megjelenítése"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:461
+#: ../pidgin/plugins/cap/cap.c:464
 msgid "Response Probability:"
 msgstr "Válasz valószínűsége:"
 
@@ -14262,8 +14116,10 @@
 msgid "Maximum response timeout:"
 msgstr "Legnagyobb válasz-időkorlát:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "perc"
 
@@ -14295,12 +14151,8 @@
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:937
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"A partnerelérhetőség bővítmény statisztikai információk megjelenítésére "
-"szolgál a felhasználó partnerlistáján található partnerekről."
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "A partnerelérhetőség bővítmény statisztikai információk megjelenítésére szolgál a felhasználó partnerlistáján található partnerekről."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -14328,12 +14180,8 @@
 msgstr "Pontértékek használata, ha..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog "
-"rendelkezni a kapcsolatban.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog rendelkezni a kapcsolatban.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -14349,33 +14197,28 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kapcsolat prioritása"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid "Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
-"beállítását."
+msgstr "Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek beállítását."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó "
-"pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
+#: ../pidgin/plugins/contact_priority.c:192
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Társalgás színei"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "A társalgási ablak színeinek testreszabása"
 
@@ -14399,7 +14242,8 @@
 msgid "Received Messages"
 msgstr "Fogadott üzenetek"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210
+#: ../pidgin/plugins/pidginrc.c:320
 #, c-format
 msgid "Select Color for %s"
 msgstr "Válassza ki %s színét"
@@ -14424,11 +14268,16 @@
 msgid "Conversation Placement"
 msgstr "Társalgás elhelyezése"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "Megjegyzés: Az \"Új társalgások\" beállítást \"Társalgások száma szerint\" értékre kell állítani."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Társalgások száma ablakonként"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Azonnali üzenő- és csevegőablakok elkülönítése szám szerinti elhelyezésnél"
 
@@ -14438,25 +14287,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Bővített elhelyezés"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Társalgások elhelyezésének beállításai."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali "
-"üzenetek és csevegés elkülönítése"
+#: ../pidgin/plugins/extplacement.c:150
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali üzenetek és csevegés elkülönítése"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -14533,12 +14378,8 @@
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek "
-"vagy hozzon létre egy újat."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek vagy hozzon létre egy újat."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:433
@@ -14557,9 +14398,7 @@
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
-"Az evolution végrehajtható állomány nem található a PATH változóban megadott "
-"útvonalon."
+msgstr "Az evolution végrehajtható állomány nem található a PATH változóban megadott útvonalon."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "An e-mail address was not found for this buddy."
@@ -14581,9 +14420,7 @@
 #. Label
 #: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá "
-"kell rendelni."
+msgstr "Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá kell rendelni."
 
 #. *< type
 #. *< ui_requirement
@@ -14591,7 +14428,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution integráció"
 
@@ -14599,8 +14436,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "Integrációt biztosít az Evolutionnel."
 
@@ -14670,7 +14507,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
 
@@ -14690,7 +14528,8 @@
 msgid "Markerline"
 msgstr "Jelölő vonal"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Vonal húzása a társalgás új üzeneteinek jelzése érdekében."
 
@@ -14698,21 +14537,19 @@
 msgid "Draw Markerline in "
 msgstr "Jelölő vonal húzása a következőkben:"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
 msgstr "_IM ablakok"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:683
 msgid "C_hat windows"
 msgstr "_Csevegőablakok"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson "
-"az MM ikonra."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson az MM ikonra."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -14761,12 +14598,8 @@
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
-"felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:672
@@ -14854,7 +14687,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:904
+#: ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
 
@@ -14900,38 +14734,30 @@
 msgid "Hyperlink Color"
 msgstr "Hiperhivatkozás színe"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView kiterjesztő mérete"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView vízszintes elválasztás"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Társalgás beviteli mező"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Társalgások előzményei"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Naplómegjelenítő"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Kérdés párbeszédablak"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Figyelmeztetés párbeszédablak"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView behúzási kiterjesztők"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "Válasszon színt"
@@ -14953,36 +14779,57 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ szöveges gyorsbillentyű téma"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "Felület színei"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Felöleti elemek méretei"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "Eszközök"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Beállítások kiírása ide: %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "A gtkrc fájlok újraolvasása"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ témavezérlés"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626
+#: ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Hozzáférést biztosít az általánosan használt gtkrc beállításokhoz."
 
@@ -14995,13 +14842,8 @@
 msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára."
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, "
-"MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a "
-"hibakereső ablakot."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (XMPP, MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a hibakereső ablakot."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
@@ -15019,12 +14861,11 @@
 
 #: ../pidgin/plugins/relnot.c:82
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
+msgid "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin.im</a>."
 msgstr "A(z) %s verzióhoz hozzájuthat a <br><a href=\"http://pidgin.im/\">http://pidgin.im</a> címről."
 
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:86
+#: ../pidgin/plugins/relnot.c:87
 msgid "New Version Available"
 msgstr "Új verzió érhető el"
 
@@ -15047,12 +14888,8 @@
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:150
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának "
-"segítségével értesíti a felhasználót."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának segítségével értesíti a felhasználót."
 
 #: ../pidgin/plugins/spellchk.c:1965
 msgid "Duplicate Correction"
@@ -15097,9 +14934,7 @@
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2314
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus "
-"kezeléséhez)"
+msgstr "Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus kezeléséhez)"
 
 #: ../pidgin/plugins/spellchk.c:2316
 msgid "Only replace _whole words"
@@ -15117,11 +14952,10 @@
 msgid "Text replacement"
 msgstr "Szöveg cseréje"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
-"kimenő üzenetekben."
+msgstr "A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a kimenő üzenetekben."
 
 #. *< type
 #. *< ui_requirement
@@ -15129,7 +14963,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:77
+#: ../pidgin/plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Partnerfigyelő"
 
@@ -15137,7 +14972,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:358
+#: ../pidgin/plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vízszintesen gördülő partnerlista."
 
@@ -15172,9 +15008,8 @@
 msgstr "Időpecsét formátumbeállításai"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "(hagyományos %s) 24 órás i_dőformátum kényszerítése"
+msgid "_Force 24-hour time format"
+msgstr "24 órás i_dőformátum kényszerítése"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15204,25 +15039,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:150
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Üzenet időpecsét-formátumok"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:153
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Az üzenet időpecsét-formátumok testreszabása."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:155
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
-"naplóüzenetek időpecsét-formátumainak testreszabását."
+#: ../pidgin/plugins/timestamp_format.c:156
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és naplóüzenetek időpecsét-formátumainak testreszabását."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
@@ -15285,13 +15116,11 @@
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a "
-"társalgás és a partnerlista ablakában.\n"
+"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a társalgás és a partnerlista ablakában.\n"
 "\n"
 "* Megjegyzés: A bővítményhez Win2000 vagy újabb szükséges."
 
@@ -15328,8 +15157,8 @@
 msgstr "_Villogtassa az ablakot új csevegésüzenetek fogadásakor"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:375
-msgid "Pidgwin Options"
-msgstr "A Pidgwin beállításai"
+msgid "Windows Pidgin Options"
+msgstr "A windowsos Pidin beállításai"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
@@ -15337,9 +15166,7 @@
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
-"partnerlista dokkolása."
+msgstr "A windowsos Pidginre jellemző beállításokat biztosít, mint például a partnerlista dokkolása."
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15351,7 +15178,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:745
+#: ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP konzol"
@@ -15386,7 +15214,5 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
-"hasznos."
-
+msgstr "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez hasznos."
+
--- a/po/zh_HK.po	Tue May 22 12:55:56 2007 +0000
+++ b/po/zh_HK.po	Wed May 23 03:09:25 2007 +0000
@@ -1,9 +1,11 @@
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.10 2007/05/22 04:39:31 acli Exp
+# ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2007, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.445 2007/04/16 03:20:24 acli Exp $
+# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -23,7 +25,6 @@
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
 # - Private Key 暫譯「私鑰」
-# - Key Pair 暫無譯文 (TODO)
 # - Key Agreement 與 Key Exchange 似乎同義,譯「交換密鑰」
 # - Passphrase 譯「密碼」
 # (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
@@ -50,8 +51,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2007-04-14 22:00-0400\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-20 01:57-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -60,12 +61,12 @@
 "Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -86,14 +87,32 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#  NOTE Untranslated
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤,請調查後改以人手完成轉移程序,"
+"並透過 http://developer.pidgin.im 回報這個錯誤。"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
@@ -107,16 +126,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -125,103 +144,103 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -232,309 +251,331 @@
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他(她)的好友清單%s%s。"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "給予認證?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "所指定的帳號目前沒有連線。"
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節,請用快顯選單。"
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實:是「加入」抑或「新增」?
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」?
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "修改設定"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+# XXX 20070518
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "資訊"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "讀取中..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "重命名"
 
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "設定別名"
+
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -543,12 +584,12 @@
 "上線:%d 人\n"
 "總數:%d 人"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號:%s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -558,91 +599,90 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-# FIXME 譯文有待改進 - 20061028
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "顯示/不顯示離線好友"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "顯示離線好友"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
@@ -665,57 +705,57 @@
 "%s 因下列錯誤結束了連線:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "連線"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
 # NOTE 沒辦法,用不到着重號,又沒法改換字型……
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "尚未支援指令,訊息因此沒有被送出。"
 
 # XXX 這是什麼?
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -724,24 +764,48 @@
 "\n"
 "%s 正在輸入..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "您離開了聊天室。"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "傳送到"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "交談"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "清空交談內容"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "顯示時間戳記"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "加入好友狀態捕捉..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -749,57 +813,60 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:顯示這個聊天室內的使用者。"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins:顯示「模組」視窗"
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist:顯示好友清單。"
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts:顯示帳號清單。"
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin:顯示除錯視窗"
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs:顯示「偏好設定」視窗"
 
-# FIXME - 20061028
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses:「已儲存的狀態」視窗"
-
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+msgstr "statuses:「狀態清單」視窗"
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -807,18 +874,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "過濾器:"
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "暫停"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "時間戳記"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -850,26 +917,26 @@
 msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
 
@@ -886,10 +953,10 @@
 msgstr "中止"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -920,75 +987,88 @@
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "電子郵件"
 
 # XXX 要覆查
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "您收到郵件!"
 
-# FIXME check - 20061025
-#  NOTE Jabber 術語,見上
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+# FIXME 原文一詞兩義,根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "已認證對方"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "繼續"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "加入"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀請"
 
 # TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "錯誤"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "模組載入失敗"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "模組卸載失敗"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -999,46 +1079,42 @@
 "Filename: %s\n"
 msgstr ""
 "名稱:%s\n"
-"板本:%s\n"
+"版本:%s\n"
 "簡介:%s\n"
 "作者:%s\n"
 "網站:%s\n"
 "檔名:%s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前,請先載入模組。"
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#  XXX 這是指模組既沒有設定任何選項,也沒有指明自己是沒有選項的
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "此模組尚未完成。"
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "設定模組"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -1048,8 +1124,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "帳號:"
 
@@ -1058,52 +1134,52 @@
 msgstr "好友名稱:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "登入"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "登出"
+msgid "Signs on"
+msgstr "登入"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "登出"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "離開"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "返回"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "閒置"
+msgid "Returns from away"
+msgstr "返回"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "閒置"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "不再閒置"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "開始輸入"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "暫停輸入"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "停止輸入"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "執行動作"
 
@@ -1131,143 +1207,138 @@
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "以鍵盤的使用為基準"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "顯示時間戳記"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "日誌格式"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -1281,104 +1352,104 @@
 msgstr "移除狀態"
 
 # FIXME 譯得太差了
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義,根本無法翻譯
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "職銜"
 
 # NOTE 應指儲存時的格式
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "格式"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "訊息"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "使用"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
-msgstr "無效的標題"
-
-#: ../finch/gntstatus.c:292
+msgstr "標題無效"
+
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "請為這個狀態輸入一個非空白的標題。"
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "標題重覆"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "為給這個狀態輸入另一個標題。"
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "子狀態"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "訊息:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "修改狀態"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "為部份帳號設定不同的狀態"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "儲存並使用"
 
@@ -1401,66 +1472,66 @@
 "X, if possible."
 msgstr "當 gnt 的剪則薄內容有所變更時,儘可能把新的內容滙出至 X 視窗系統。"
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 登入"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 登出"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 送出一個訊息給您"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 提到您的暱稱"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 送出一個訊息給您。"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "您收到即時訊息"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天室談話"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "有人在聊天室中提到您的名字"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "也要「嗶」聲!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "給終端機視窗設定「URGENT」(緊急資訊)提示"
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
@@ -1514,69 +1585,70 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1587,18 +1659,18 @@
 # XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1622,7 +1694,7 @@
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1645,40 +1717,40 @@
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -1700,6 +1772,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱:%s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "因下列原因,Purple 的 D-BUS 伺服器未有執行"
+
 # NOTE 暫譯,或許有其他意義
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1750,7 +1826,7 @@
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1794,23 +1870,23 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1821,60 +1897,60 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "「%s」不是一個有效的檔案名稱。\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2170,29 +2246,29 @@
 msgid "Set Autoaccept Setting"
 msgstr "設定自動接受選項"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #  TODO: 不通順 - 20070414
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "問一問我"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "自動接受"
 
@@ -2210,17 +2286,17 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2228,11 +2304,11 @@
 "檔案儲存路徑\n"
 "(請提供完整路徑)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "自動拒絕非來自好友清單中的使用者"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2240,108 +2316,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "(只發生在未與傳送者進行交談的情況下)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "適用於所有通訊協定的自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆,只需在這模"
-"組的選項視窗設定即可;為個別好友設定自動回覆,請在好友清單中以滑鼠右鍵點擊該"
-"個好友;為您的個別帳戶設定自動回覆,請在這模組的選項視窗按「進階」按紐。"
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "設定自動回覆給 %s 的訊息"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "設定自動回覆訊息"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr "當自動回覆功能啟動後,每當好友給您送出訊息時,下列訊息將被自動送出:"
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "設定自動回覆訊息(_A)"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "自動回覆訊息"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "何時發出自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "當我的帳號是在「離開」狀態時(_A)"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "當我的帳號是在「閒置」狀態時(_I)"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "預設回覆訊息(_D)"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "狀態訊息"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "以狀態訊息作為自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "每當設定了狀態訊息時"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "只在沒有設定自動回覆訊息時"
-
-#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
-#  NOTE: (23:41:12) elb: wing: it is the latter
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "自動回覆之間的相隔時間"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "相隔時間下限(分)(_M)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "送出自動回覆訊息的次數"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "次數上限 (_X)"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "我現在不在位子上。請您留下您的訊息,當我回來的時候,我將儘快給您回覆。"
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "備註"
 
@@ -2349,10 +2325,12 @@
 msgid "Enter your notes below..."
 msgstr "請在下面的空位輸入備註"
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "編輯備註..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2369,7 +2347,7 @@
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
@@ -2431,46 +2409,46 @@
 
 #  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
 #  FIXME 譯文有待改進
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分鐘數"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "自定個別帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "您的帳號都不是閒置狀態。"
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "取消帳號閒置時間設定"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "取消設定(_U)"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "設定所有帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "取消所有已閒置帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "允許您手動設定您已閒置了多久時間"
 
@@ -2547,7 +2525,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "隱藏「加入/離開聊天室」訊息"
 
@@ -2555,12 +2533,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "不顯示多餘的「加入/離開聊天室」訊息"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2682,20 +2660,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2708,12 +2686,12 @@
 "\n"
 "注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono 模組載入器"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "使用Mono讀取.NET模組"
 
@@ -2736,7 +2714,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "顯示訊息前先開新行。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2776,31 +2754,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "是"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "否"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "使用「好友狀態捕捉」儲存離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問,務必使用「好友狀態捕捉」儲存離線訊息。"
 
@@ -2810,51 +2788,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "未卜先知"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "「未卜先知」將要開始的交談"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與您交談,就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談,就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
 "Yahoo。"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "您感受到了原力的擾動..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "只用於好友清單中的使用者"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "離開時停用"
 
 # FIXME 譯文有待改進 - 20061027
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "浮現「未卜先知」的交談"
 
@@ -2919,7 +2897,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2927,8 +2905,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -2938,7 +2916,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2946,8 +2924,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -2998,7 +2976,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "好友狀態通知"
 
@@ -3006,22 +2984,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3043,18 +3021,18 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
 
@@ -3068,53 +3046,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber 帳號"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP 帳號"
 
 # NOTE 這是通訊協定名稱,不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3155,7 +3133,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
+"對於您目前所設定的代理伺服器型態來說,您所指定的伺服器名稱及通訊埠是無效的"
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
@@ -3199,67 +3177,67 @@
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "註冊成功!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3267,220 +3245,220 @@
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前所提供的密碼與指定的帳號不符。"
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸您的舊密碼及你的新密碼:"
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友;%s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "上線"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
 # FIXME 這不像對,要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "修改密碼..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "上傳好友清單到伺服器"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "修改密碼..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "上傳好友清單到伺服器"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -3495,35 +3473,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -3558,7 +3536,7 @@
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3581,34 +3559,34 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -3616,30 +3594,30 @@
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3653,56 +3631,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "姓名"
 
@@ -3710,232 +3687,232 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s:禁止清單已滿"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "閒置時間"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "上線自"
 
 #  XXX 其實譯得不太對,可以改進一點
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
-msgstr "無效的暱稱"
-
-#: ../libpurple/protocols/irc/msgs.c:888
+msgstr "暱稱無效"
+
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱,暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "無法加入 %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "無法加入 %s:必須註冊。"
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;:執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [訊息]:設定一個離開訊息,或者在離開時不指定任何訊息。"
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3943,7 +3920,7 @@
 "deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有"
 "「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3952,7 +3929,7 @@
 "devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道"
 "中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3960,23 +3937,23 @@
 "invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的"
 "頻道。"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給"
-"予並有需要)加入所指定的聊天室。"
-
-#: ../libpurple/protocols/irc/parse.c:125
+"j &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]:以指定的密碼匙"
+"(如有給予並有需要)加入所指定的聊天室。"
+
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如"
-"有給予並有需要)加入所指定的聊天室。"
-
-#: ../libpurple/protocols/irc/parse.c:126
+"join &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]:以指定的密碼"
+"匙(如有給予並有需要)加入所指定的聊天室。"
+
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3984,7 +3961,7 @@
 "kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
 "才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3992,22 +3969,22 @@
 "list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作"
 "之後,強行中止您的連線。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要執行的動作&gt;:執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:送出一個指令到 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;:設定或解除頻道╱使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4015,20 +3992,20 @@
 "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾"
 "頻道中)。"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:送出一個指令到 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4036,7 +4013,7 @@
 "op &lt;暱稱&gt; [暱稱] ...:賦與某個使用者「頻道管理者」權限。您必須具有「頻"
 "道管理者」權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4044,11 +4021,11 @@
 "operwall &lt;訊息&gt;:如果您不知道這是幹什麼用的,您可能沒有辦法使用這個指"
 "令。"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:送出一個指令到 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4056,7 +4033,7 @@
 "part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
 "息。"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4064,7 +4041,7 @@
 "ping [暱稱]:查詢某一個使用者的網路回應速度(或在沒有指定使用者時,查詢伺服器"
 "的回應速度)。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4072,16 +4049,16 @@
 "query &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公"
 "眾頻道)。"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]:自伺服器離線,並送出指定的訊息。"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4089,23 +4066,23 @@
 "remove &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必須具有「頻道管理者」的"
 "權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time:顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新主題]:檢視或修改頻道主題"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:設定或解除使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [暱稱]:送出 CTCP VERSION 要求給使用者"
-
-#: ../libpurple/protocols/irc/parse.c:148
+msgstr "version [暱稱]:給使用者送出 CTCP VERSION 要求"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4113,7 +4090,7 @@
 "voice &lt;暱稱&gt; [暱稱] ...:賦與使用者的「發言」權限。您必須具有「頻道管理"
 "者」的權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4121,150 +4098,156 @@
 "wallops &lt;message&gt;:如果您不知道這是幹什麼用的,您可能就沒有辦法使用它"
 "了。"
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;:取得使用者資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;暱稱&gt;:取得已離線的使用者的資訊。"
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "沒有提供密碼,伺服器無法為你進行認證"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "伺服器送來了無效的回應。"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-msgid "Server does not use any supported authentication method"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "無效的伺服器回應。"
-
 # XXX 好像有些怪,譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "街道地址"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "地址(續)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "市/村"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "省/州"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "國家"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "電話"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4272,53 +4255,53 @@
 msgstr "電子郵件"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "所屬機構"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "所屬部門"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "編輯 Jabber vCard"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "編輯 XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "作業系統"
 
@@ -4327,63 +4310,63 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4392,43 +4375,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4436,69 +4419,69 @@
 "請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令:%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "填入一個或多個欄位,以搜尋Jabber使用者。"
-
 #: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "填入一個或多個欄位,以搜尋XMPP使用者。"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "搜尋Jabber使用者"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
@@ -4511,88 +4494,88 @@
 msgid "_Handle:"
 msgstr "暱稱(_H):"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
@@ -4616,174 +4599,178 @@
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 帳號無效"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "XMPP 帳號無效"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP 帳號無效,域名是必須設定的。"
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "省/州"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "註冊新的 Jabber 帳戶"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "未認證"
 
-# NOTE 這些奇怪術語(至「Subscription」條)的解釋由 faceprint 提供
+# NOTE 這些奇怪 Jabber 術語(至「Subscription」條)的解釋由 faceprint 提供
 # NOTE LSchiere2 的補充如下:
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "修改 Jabber 密碼"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "修改 XMPP 密碼"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4791,51 +4778,52 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "畸型的 Jabber ID"
+# FIXME 譯文聽來好像有點怪 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "畸型的 XMPP 帳號"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4843,78 +4831,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4924,181 +4912,181 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
-msgstr "伺服器已不再支援所給定的伺服器名稱"
+msgstr "伺服器已不再支援所指定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
-msgstr "伺服器不支援給定的字元編碼"
+msgstr "伺服器不支援指定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
-msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
+msgstr "伺服器不支援指定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
-msgstr "不支援給定的 XMPP 版本"
-
-#: ../libpurple/protocols/jabber/jabber.c:1586
+msgstr "不支援指定的 XMPP 版本"
+
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]:禁止某使用者進入聊天室"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5107,7 +5095,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5115,19 +5103,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
@@ -5142,56 +5130,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 協定模組"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 協定模組"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "域名"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s 已經離開這個交談。"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 訊息錯誤"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP 訊息錯誤"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -5200,35 +5198,35 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -5348,7 +5346,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "嚐試將一個使用者加入不存在的群組"
+msgstr "嘗試將一個使用者加入不存在的群組"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5466,7 +5464,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5505,360 +5503,360 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
-msgstr "設定您的行動電話號碼。"
-
-#: ../libpurple/protocols/msn/msn.c:305
+msgstr "設定您的流動電話號碼。"
+
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
-"裝置上呢?"
-
-#: ../libpurple/protocols/msn/msn.c:310
+"您是否允許在您好友清單中的好友傳送 Mobile Page 到您的流動電話,或是其他的流動"
+"通訊器材上呢?"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "你在他(她)的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
-msgstr "設定行動電話號碼..."
-
-#: ../libpurple/protocols/msn/msn.c:607
+msgstr "設定流動電話號碼..."
+
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
-msgstr "開啟 / 關閉行動裝置..."
-
-#: ../libpurple/protocols/msn/msn.c:612
+msgstr "開啟 / 關閉流動通訊器材..."
+
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
-msgstr "傳送至行動電話"
-
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+msgstr "傳送至流動電話"
+
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
-msgstr "個人行動電話"
-
-#: ../libpurple/protocols/msn/msn.c:1584
+msgstr "個人流動電話"
+
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
-msgstr "商務行動電話"
-
-#: ../libpurple/protocols/msn/msn.c:1614
+msgstr "商務流動電話"
+
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
-msgstr "商務呼叫器"
-
-#: ../libpurple/protocols/msn/msn.c:1615
+msgstr "商務傳呼機"
+
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1805
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5867,14 +5865,14 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
 "用者存在,但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5889,19 +5887,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
@@ -5977,17 +5975,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6042,8 +6040,8 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
@@ -6152,130 +6150,130 @@
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器;請稍後重試"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "錯誤的帳號或密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "無法辦識您所輸入的帳號內的主機名稱"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "您輸入了無效的帳號"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線,或者您已被他(她)拒絕"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
@@ -6360,7 +6358,7 @@
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
@@ -6371,7 +6369,7 @@
 msgstr "無法建立會議 (%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
@@ -6388,8 +6386,8 @@
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -6399,43 +6397,43 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "認證中..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "無法連線到伺服器。"
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6446,17 +6444,17 @@
 "\n"
 "時間:%s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6466,17 +6464,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6490,22 +6488,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6513,8 +6511,8 @@
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6551,8 +6549,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM 協定模組"
 
@@ -6566,14 +6564,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ 協定模組"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
@@ -6708,7 +6706,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6719,7 +6717,7 @@
 "編碼;如果您知道那是什麼編碼,請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6729,53 +6727,54 @@
 "用有問題的用戶端程式。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+# NOTE 據其他PO檔的譯文看,「AP」應該不是「應用程式」
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "應用程式使用者"
-
-#: ../libpurple/protocols/oscar/oscar.c:654
+msgstr "AP 使用者"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6786,100 +6785,100 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6888,7 +6887,7 @@
 "無法連線至認證伺服器:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6897,20 +6896,20 @@
 "無法連線到 BOS 伺服器:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6920,75 +6919,76 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線,那麼您的等待時間將會更加的延長。"
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試連線,"
+"那麼您的等待時間將會更加的延長。"
+
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6997,53 +6997,53 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7053,17 +7053,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7076,7 +7076,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7089,7 +7089,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7102,38 +7102,38 @@
 "訊息為:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7143,21 +7143,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7165,74 +7165,70 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "速率限制錯誤。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7240,113 +7236,113 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
-msgstr "行動電話"
-
-#: ../libpurple/protocols/oscar/oscar.c:3761
+msgstr "流動電話"
+
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7354,37 +7350,37 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4440
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7393,22 +7389,22 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7419,11 +7415,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7434,17 +7430,17 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4685
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7452,16 +7448,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7470,12 +7466,12 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7485,7 +7481,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7495,23 +7491,23 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7521,32 +7517,32 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對,又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7554,89 +7550,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文,但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」,不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7644,74 +7640,74 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7747,7 +7743,7 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "連線(_C)"
 
@@ -7799,7 +7795,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
-msgstr "行動電話號碼"
+msgstr "流動電話號碼"
 
 #: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
@@ -7914,93 +7910,99 @@
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "成功修改了您的好友資訊。"
 
-#  FIXME 這是很壞的譯文,無奈這是原文的錯 :P
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr "自訂的表情圖案暫時未獲支援,請自下列目錄選取圖案:"
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr "自訂的表情圖案暫時未獲支援,請自 %s 選取圖案。"
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "無效的 QQ 表情"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "請輸入原因:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "拒絕"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "對不起,我和你合不來……"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "連同認證要求的新增好友失敗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "您成功移除了一個好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "您成功從一個好友的好友清單中移除了您自己"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "使用者 %d 需要認證"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "請輸入要求"
 
 # XXX - 20061026
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "送出"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "成功將 %d 加入好友清單"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid 錯誤"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "無效的 QQid"
 
@@ -8037,59 +8039,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "您只可搜尋永久群組\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "原因:%s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "允許"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "管理人 %d 拒絕了您加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "管理人 %d 允許了您加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "群組「%2$d」新增了您 [%1$d]"
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "群組已新增至好友清單。"
 
@@ -8117,33 +8119,33 @@
 msgid "This group does not allow others to join"
 msgstr "這群組不容許外人加入"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "您成功離開群組"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ 群組認證"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "您確定要離開這個群 (Qun) 嗎?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "請注意,假如您是創立者,這最終會把這個群 (Qun) 移除。"
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "確定"
 
@@ -8156,42 +8158,43 @@
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "允許這個要求?"
 
 #  NOTE QQ「member」應是「成員」
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME 暫譯 ambrose 20070415
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "成功更改了群的資訊"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "成功建立了一個群 (Qun)"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "要立刻設定該群 (Qun) 的詳情嗎?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "設定"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "系統訊息"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "伺服器回應"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "送出即時訊息失敗\n"
 
@@ -8201,7 +8204,7 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
-msgstr ""
+msgstr "「登入要求」Token 出現錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8210,11 +8213,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8265,49 +8268,49 @@
 msgstr "名稱無效"
 
 #  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>:%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址:</b>%s:%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間:</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "登入資訊"
 
@@ -8327,6 +8330,10 @@
 msgid "Exit this QQ Qun"
 msgstr "離開這個 QQ 群 (Qun)"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "封鎖這個好友"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8337,15 +8344,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "以 TCP 登入"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "以隱藏狀態登入"
 
@@ -8390,52 +8397,54 @@
 msgid "Login failed, no reply"
 msgstr "登入失敗,沒有回應"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "您想將這個使用者加入到您的好友名單中嗎?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 已將您加入到他(她)的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "您想將他(她)加入到您的好友清單嗎?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s 已將您 [%s] 加入到他(她)的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "使用者「%s」允許了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s 想要將您(%s)加入他(她)的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "訊息:%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
 # FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "您要將他(她)加入您的好友清單嗎?"
 
@@ -8530,7 +8539,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
@@ -8547,54 +8556,54 @@
 msgid "Unable to send message: "
 msgstr "無法送出訊息:"
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
+#: ../libpurple/protocols/sametime/sametime.c:3229
+msgid "Microphone"
+msgstr "麥克風"
+
 #: ../libpurple/protocols/sametime/sametime.c:3230
-msgid "Microphone"
-msgstr "麥克風"
-
-#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX 暫譯
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "支援"
 
 #  XXX 怪
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "外部使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "請為新的會議室輸入一個主題,同時發出一個邀請訊息給%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "建立"
 
@@ -8626,25 +8635,25 @@
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
 #  XXX 要覆查 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "主題:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社群伺服器"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8654,39 +8663,39 @@
 "入。"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知(0x%04x)<br>"
 
 #  XXX 要覆查
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "上次使用的用戶端程式(如已知)"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "輸入了一個不明的使用者 ID"
-
-#: ../libpurple/protocols/sametime/sametime.c:4328
+msgstr "輸入了一個不明確的使用者 ID"
+
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8695,16 +8704,16 @@
 "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者,以便新增至好友清單"
 "內。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "選擇使用者"
 
 #  TODO 請覆查,譯文有待改進
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者:找不到使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8713,11 +8722,11 @@
 "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
 "除。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8726,63 +8735,63 @@
 "讀取檔案 %s 發生錯誤;\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "好友清單存放於遠端"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組:群組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8792,26 +8801,26 @@
 "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組,以加入您的好"
 "友清單。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組:找不到群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在您的 Sametime 社群中,並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8819,12 +8828,12 @@
 "輸入 Notes 通訊錄群組名稱於欄位中,以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8834,66 +8843,66 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐,把他(她)們新增至好友清"
 "單內,或向他(她)們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位,來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入(忽略伺服器重新導向)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8908,103 +8917,103 @@
 #: ../libpurple/protocols/silc/buddy.c:139
 #: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
-msgstr "交換密鑰"
+msgstr "交換密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "無法交換密鑰"
+msgstr "無法交換密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "交換密鑰中出現錯誤"
+msgstr "交換密碼匙中出現錯誤"
 
 #: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr "交換密鑰失敗"
+msgstr "交換密碼匙失敗"
 
 #: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr "交換密鑰逾時"
+msgstr "交換密碼匙逾時"
 
 #: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr "交換密鑰被中止"
+msgstr "交換密碼匙被中止"
 
 #: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "交換密鑰己開始"
+msgstr "交換密碼匙己開始"
 
 #: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "不可與自己交換密鑰"
+msgstr "不可與自己交換密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "由 %s 收到一個交換密鑰要求,您想交換密鑰嗎?"
-
-#: ../libpurple/protocols/silc/buddy.c:298
+msgstr "由 %s 收到一個交換密碼匙要求,您想交換密碼匙嗎?"
+
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"遠端的使用者正在等候交換密鑰:\n"
+"遠端的使用者正在等候交換密碼匙:\n"
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
-msgstr "交換密鑰要求"
-
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+msgstr "交換密碼匙要求"
+
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
-msgstr "無法設定即時訊息密鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:465
+msgstr "無法設定即時訊息密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
-msgstr "取得公鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:548
+msgstr "取得公開密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr "無法取得公鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
-msgid "Show Public Key"
-msgstr "顯示公鑰"
+msgstr "無法取得公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1654
+msgid "Show Public Key"
+msgstr "顯示公開密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
-msgstr "無法載入公鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:712
+msgstr "無法載入公開密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -9013,216 +9022,218 @@
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公"
-"鑰」指令即可。"
+"直至您匯入好友的公開密碼匙,您將無法收到該好友的好友通知。要取得公開密碼匙,"
+"用「取得公開密碼匙」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
-
-#: ../libpurple/protocols/silc/buddy.c:1079
+msgstr ""
+"要新增好友,必須匯入他(她)的公開密碼匙。要匯入公開密碼匙,請按「匯入」。"
+
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
-
-#: ../libpurple/protocols/silc/buddy.c:1179
+"超過一個使用者使用同一公開密碼匙。請從清單選擇正確的使用者,以便新增至好友清"
+"單內。"
+
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "機械人"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "開心"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "時區"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
-msgstr "清除即時訊息密鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:1635
+msgstr "清除即時訊息密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
-msgstr "要交換密鑰之即時訊息"
-
-#: ../libpurple/protocols/silc/buddy.c:1640
+msgstr "要交換密碼匙之即時訊息"
+
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
-msgstr "取得公鑰..."
-
-#: ../libpurple/protocols/silc/buddy.c:1660
+msgstr "取得公開密碼匙..."
+
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
@@ -9282,31 +9293,31 @@
 #: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
+msgstr "<br><b>創立者之公開密碼匙指紋:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
+msgstr "<br><b>創立者之公開密碼匙指紋可讀版本 (Babbleprint):</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
-msgstr "新增頻道公鑰"
+msgstr "新增頻道公開密碼匙"
 
 #. Add new public key
 #: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
-msgstr "開啟公鑰..."
-
-#: ../libpurple/protocols/silc/chat.c:400
+msgstr "開啟公開密碼匙..."
+
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
-msgstr "頻道公鑰清單"
-
-#: ../libpurple/protocols/silc/chat.c:412
+msgstr "頻道公開密碼匙清單"
+
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9314,140 +9325,140 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數位"
-"簽章。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公鑰,加入頻"
-"道就必須擁有所列公鑰內之其一。"
+"頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數碼"
+"簽署。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公開密碼匙,"
+"加入頻道就必須擁有所列公開密碼匙內之其一。"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,您必須首先加入頻道 %s"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -9472,7 +9483,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr "交換密鑰失敗"
+msgstr "交換密碼匙失敗"
 
 #: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
@@ -9488,7 +9499,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "無法交換密鑰以供傳輸"
+msgstr "無法交換密碼匙以供傳輸"
 
 #: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
@@ -9559,7 +9570,7 @@
 msgstr "職責"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "所屬機構"
 
@@ -9588,19 +9599,19 @@
 #: ../libpurple/protocols/silc/ops.c:1285
 #: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
-msgstr "公鑰指紋"
+msgstr "公開密碼匙指紋"
 
 #: ../libpurple/protocols/silc/ops.c:1286
 #: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
-msgstr "公鑰指紋可讀版本 (Babbleprint)"
+msgstr "公開密碼匙指紋可讀版本 (Babbleprint)"
 
 #: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
@@ -9626,7 +9637,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
-msgstr "沒有收到公鑰"
+msgstr "沒有收到公開密碼匙"
 
 #: ../libpurple/protocols/silc/ops.c:1519
 #: ../libpurple/protocols/silc/ops.c:1532
@@ -9712,7 +9723,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
-msgstr "密鑰交換失敗"
+msgstr "密碼匙交換失敗"
 
 #: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
@@ -9735,67 +9746,69 @@
 
 #: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
-msgstr "核實伺服器的公鑰中"
-
-#: ../libpurple/protocols/silc/ops.c:1910
+msgstr "核實伺服器的公開密碼匙中"
+
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的用戶端程式"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "失敗:遠端不信任/不支援您的公鑰"
-
-#: ../libpurple/protocols/silc/ops.c:1945
+msgstr "失敗:遠端不信任/不支援您的公開密碼匙"
+
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
-
-#: ../libpurple/protocols/silc/ops.c:1948
+msgstr "失敗:遠端不支援建議中的密碼匙交換群組 (KE group)"
+
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
-
-#: ../libpurple/protocols/silc/ops.c:1954
+msgstr "失敗:遠端不支援建議中的公開密碼匙加密標準"
+
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎?"
-
-#: ../libpurple/protocols/silc/pk.c:108
+msgstr ""
+"收到 %s 的公開密碼匙,但收到的公開密碼匙跟您現有的不同。仍然接受這個公開密碼"
+"匙嗎?"
+
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "收到 %s 的公鑰,接受這個公鑰嗎?"
-
-#: ../libpurple/protocols/silc/pk.c:112
+msgstr "收到 %s 的公開密碼匙,接受這個公開密碼匙嗎?"
+
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9803,22 +9816,22 @@
 "%s\n"
 "%s\n"
 msgstr ""
-"%s 的公鑰的指紋及其可讀版本 (babbleprint) 為:\n"
+"%s 的公開密碼匙的指紋及其可讀版本 (babbleprint) 為:\n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
-msgstr "核實公鑰"
-
-#: ../libpurple/protocols/silc/pk.c:119
+msgstr "核實公開密碼匙"
+
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "檢視(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
-msgstr "不支援的公鑰類型"
+msgstr "不支援的公開密碼匙類型"
 
 #: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
@@ -9830,7 +9843,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
-msgstr "交換密鑰中"
+msgstr "交換密碼匙中"
 
 #: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
@@ -9857,7 +9870,7 @@
 #: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對:%s"
+msgstr "無法讀取 SILC 配對密碼匙:%s"
 
 #: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
@@ -9867,7 +9880,7 @@
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "正常"
 
@@ -9934,174 +9947,174 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:779
-msgid "No Message of the Day available"
-msgstr "沒有是日訊息"
-
 #: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+msgid "No Message of the Day available"
+msgstr "沒有是日訊息"
+
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
-msgstr "密鑰對產生失敗"
-
-#: ../libpurple/protocols/silc/silc.c:914
+msgstr "配對密碼匙產生失敗"
+
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
-msgstr "密鑰長度"
-
-#: ../libpurple/protocols/silc/silc.c:916
+msgstr "密碼匙長度"
+
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
-msgstr "公鑰檔案"
-
-#: ../libpurple/protocols/silc/silc.c:918
+msgstr "公開密碼匙檔案"
+
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
-msgstr "私鑰檔案"
-
-#: ../libpurple/protocols/silc/silc.c:941
+msgstr "私人密碼匙檔案"
+
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
-msgstr "產生密鑰對"
-
-#: ../libpurple/protocols/silc/silc.c:992
+msgstr "產生配對密碼匙"
+
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
-msgstr "產生 SILC 密鑰對..."
-
-#: ../libpurple/protocols/silc/silc.c:1104
+msgstr "產生 SILC 配對密碼匙..."
+
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令:%s(可能是客戶端的錯誤)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網路上的聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10109,15 +10122,15 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
 "模式"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10125,37 +10138,37 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的用戶端"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;暱稱|伺服器&gt;:取得用戶端或伺服器的公鑰"
-
-#: ../libpurple/protocols/silc/silc.c:1690
+msgstr "getkey &lt;暱稱|伺服器&gt;:取得用戶端或伺服器的公開密碼匙"
+
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10172,71 +10185,71 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "網路"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
-msgstr "公鑰檔案"
-
-#: ../libpurple/protocols/silc/silc.c:1857
+msgstr "公開密碼匙檔案"
+
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
-msgstr "私鑰檔案"
+msgstr "私人密碼匙檔案"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
-msgstr "使用公鑰認證"
+msgstr "使用公開密碼匙認證"
 
 #  TODO 譯文有待改進,這是意譯
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
-msgstr "拒絕沒有交換密鑰的即時訊息"
-
-#: ../libpurple/protocols/silc/silc.c:1892
+msgstr "拒絕沒有交換密碼匙的即時訊息"
+
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
-msgstr "數位簽署所有即時訊息"
+msgstr "數碼簽署所有即時訊息"
 
 #: ../libpurple/protocols/silc/util.c:207
 #: ../libpurple/protocols/silc/util.c:247
@@ -10284,7 +10297,7 @@
 #: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "密鑰長度: \t%d 個位元\n"
+msgstr "密碼匙長度: \t%d 個位元\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #, c-format
@@ -10293,7 +10306,7 @@
 "%s\n"
 "\n"
 msgstr ""
-"公鑰指紋:\n"
+"公開密碼匙指紋:\n"
 "%s\n"
 "\n"
 
@@ -10303,13 +10316,13 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"公鑰指紋可讀版本 (Babbleprint):\n"
+"公開密碼匙指紋可讀版本 (Babbleprint):\n"
 "%s"
 
 #: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
-msgstr "公鑰資訊"
+msgstr "公開密碼匙資訊"
 
 #: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
@@ -10353,26 +10366,26 @@
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10384,36 +10397,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態(請注意:任何人都能看到您)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -10544,8 +10557,8 @@
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線,那麼您的等待時間將會更加的延長。"
+"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試連線,"
+"那麼您的等待時間將會更加的延長。"
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10638,12 +10651,12 @@
 msgstr "TOC 協定模組"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s 在呼叫您!"
@@ -10654,16 +10667,16 @@
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10672,11 +10685,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10686,11 +10699,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10699,70 +10712,70 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
-msgid "Not at Desk"
-msgstr "不在座位"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "不在座位"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10770,91 +10783,92 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線,所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10868,57 +10882,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "傳呼伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11128,23 +11142,23 @@
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "使用者"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "隱藏或未登入"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "任何人"
 
@@ -11155,65 +11169,65 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室(交談) %s,%s,%s 失敗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11221,7 +11235,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11229,18 +11243,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -11254,16 +11268,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -11273,11 +11287,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -11287,22 +11301,22 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "域名"
 
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -11344,18 +11358,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -11367,16 +11381,16 @@
 msgstr "我現在不在位子上"
 
 # FIXME 這很明顯是誤譯,但想不到怎樣寫才對 - 20061025
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11385,58 +11399,58 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "離線"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
-msgstr "使用行動裝置"
-
-#: ../libpurple/status.c:611
+msgstr "使用流動通訊器材"
+
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
@@ -11446,13 +11460,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11460,79 +11474,79 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體,網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
@@ -11559,59 +11573,59 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "登入選項"
 
 # NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "帳號別名(只在本機生效):"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "使用者自定選項"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "使用下列好友圖示:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11620,60 +11634,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11697,233 +11711,233 @@
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11932,132 +11946,128 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/工具/好友狀態捕捉"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>密碼:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12075,23 +12085,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5367
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12100,66 +12110,66 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "群組:"
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12172,65 +12182,65 @@
 "re-enable the account."
 msgstr ""
 "%s\n"
-"在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再試著重新連線。"
-
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+"在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再嘗試重新連線。"
+
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
@@ -12253,130 +12263,130 @@
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2790
-msgid "/Conversation/Se_nd File..."
-msgstr "/交談/傳送檔案(_N)..."
-
-#: ../pidgin/gtkconv.c:2791
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/交談/新增好友狀態捕捉(_P)..."
-
 #: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/交談/傳送檔案(_N)..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/交談/新增好友狀態捕捉(_P)..."
+
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12385,238 +12395,238 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3030
-msgid "/Options/Enable Logging"
-msgstr "/選項/開始記錄日誌"
-
 #: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Logging"
+msgstr "/選項/開始記錄日誌"
+
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
-msgstr "使用者正在輸入..."
-
-#: ../pidgin/gtkconv.c:3176
+msgstr "對方正在輸入..."
+
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
-msgstr "使用者輸入了一些東西,不過暫停了"
+msgstr "對方輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "主要開發者"
 
@@ -12625,8 +12635,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "開發者"
 
@@ -12634,160 +12645,170 @@
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber 開發者"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "XMPP 開發者"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "原作者"
 
-#  NOTE 譯文完全不統一,依其他 open source project「慣例」(只有兩三個)譯成「南非荷蘭文」
-#: ../pidgin/gtkdialogs.c:121
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
-msgid "Bulgarian"
-msgstr "保加利亞文"
-
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "保加利亞文"
+
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "孟加拉文"
 
-# NOTE 港譯「波斯尼亞」
-#: ../pidgin/gtkdialogs.c:129
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 港譯「波斯尼亞」,台一般譯「波士尼亞」
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
-msgstr "波士尼亞文"
-
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+msgstr "波斯尼亞文"
+
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "加泰隆文"
 
 # NOTE 直譯是「瓦倫西亞式加泰隆文」,但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "德文"
 
 # NOTE 國名是「不丹」,中譯文依國名不依語文名
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "不丹文"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:147
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文,不是語,但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "法文"
 
-#: ../pidgin/gtkdialogs.c:155
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "加里西亞文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "古吉拉特文翻譯小組"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: ../pidgin/gtkdialogs.c:159
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
-msgstr "北印度文"
-
-#: ../pidgin/gtkdialogs.c:160
+msgstr "印度文"
+
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -12795,41 +12816,53 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "意大利文"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "喬治亞文"
 
-# NOTE: 這是KDE譯法,也見於台灣某大學網站 :P
-#: ../pidgin/gtkdialogs.c:165
+# FIXME 可以譯好一點 20070520 acli
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 註:KDE 譯「坎納達」
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
-msgstr "坎納達文"
-
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgstr "康納達文"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "康納達文翻譯小組"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "韓文"
 
-# NOTE 台譯「庫德」,港譯「庫爾德」;但台灣政府也有用「庫爾德」,故「庫爾德」較好
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#  NOTE 港譯只有「庫爾德」,台譯有「庫德」(標準譯法,看來亦較常見)和「庫爾德」
+#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,保留台式譯法「庫德」
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
-msgstr "庫爾德文"
-
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+msgstr "庫德文"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -12837,234 +12870,242 @@
 #  NOTE 音譯包括:博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
 #  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
-#  XXX 暫時譯成「挪威布克莫爾文」
-#: ../pidgin/gtkdialogs.c:172
+#  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
-msgstr "挪威布克莫爾文"
-
-#: ../pidgin/gtkdialogs.c:173
+msgstr "標準挪威文"
+
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: ../pidgin/gtkdialogs.c:175
+#  NOTE 這是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
-msgstr "挪威文"
-
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgstr "新挪威文"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#  XXX 某大學論文譯法
-#: ../pidgin/gtkdialogs.c:181
+#  NOTE「普什圖」在三地都看來是較正常的譯法
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
-msgstr "巴斯多文 (Pashto)"
-
-#: ../pidgin/gtkdialogs.c:182
+msgstr "普什圖文"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "斯洛伐克文"
-
 #  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
-msgstr "斯洛維尼亞文"
-
-#: ../pidgin/gtkdialogs.c:187
+msgstr "斯洛文尼亞文"
+
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "瑞典文"
 
-# NOTE 港譯「泰米爾」
-#: ../pidgin/gtkdialogs.c:191
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
-msgstr "塔米爾文"
-
-#: ../pidgin/gtkdialogs.c:192
+msgstr "泰米爾文"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
-msgstr "特魯固文"
-
-#: ../pidgin/gtkdialogs.c:193
+msgstr "德拉威文"
+
+#: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "港式中文"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-# XXX Yahoo譯法
-#: ../pidgin/gtkdialogs.c:204
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s 係一個以 GTK+ 開發的模組化訊息程式,同時提供 AIM、MSN、Yahoo!、Jabber、"
-"ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Bonjour、"
-"Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修改或發佈這個程式,只需按"
-"照 GPL(第二版或任何以後的版本)的條款即可;%s 內已附有一份 GPL, 收錄在名為"
-"「COPYING」的檔案之內。%s 係有版權的著作,版權歸全部貢獻者共同所有,貢獻者芳"
-"名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s 係一個以 GTK+ 開發,圖形介面式的模組化訊息程式,以 libpurple 為基礎,同時"
+"提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
+"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修"
+"改或發佈這個程式,只需按照 GPL(任擇第二版或較新的其他版本)的條款即可;%s 內"
+"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作,版權歸全"
+"部貢獻者共同所有,貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
+"何保用。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
-# NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: ../pidgin/gtkdialogs.c:398
+# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
+# NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../pidgin/gtkdialogs.c:428
+#  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
-msgstr "美工人員"
-
-#: ../pidgin/gtkdialogs.c:443
+msgstr "平面設計"
+
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13073,82 +13114,82 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
-"作嗎?"
+"您正在嘗試將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個"
+"動作嗎?"
 msgstr[1] ""
-"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
-"作嗎?"
+"您正在嘗試將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個"
+"動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "您正試著將群組 %s 與 %s 合併,新群組以後者命名。您要繼續這個動作嗎?"
-
-#: ../pidgin/gtkdialogs.c:1093
+msgstr "您正在嘗試將群組 %s 與 %s 合併,新群組以後者命名。您要繼續這個動作嗎?"
+
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
-
-#: ../pidgin/gtkdialogs.c:1147
+"您正在嘗試將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
+
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
+msgstr "您正在嘗試將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
-
-#: ../pidgin/gtkdialogs.c:1209
+msgstr "您正在嘗試將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
+
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13157,37 +13198,34 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "有新訊息時閃動"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "結束程式"
 
-#  XXX 這個太奇怪了 (^^;)
+#  NOTE 這是指「未開始」傳輸檔案,不是「未啟動」
 #: ../pidgin/gtkft.c:153
 msgid "Not started"
-msgstr "未啟動"
+msgstr "未開始"
 
 # XXX 暫譯
 #: ../pidgin/gtkft.c:273
@@ -13267,7 +13305,7 @@
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13277,11 +13315,11 @@
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
@@ -13314,7 +13352,7 @@
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13325,7 +13363,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13335,7 +13373,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13346,7 +13384,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13357,11 +13395,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -13472,21 +13510,21 @@
 msgstr "插入表情"
 
 #  XXX 不通順 - ambrose 20070415
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄,與 %1$s 交談的日誌?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄,在聊天室「%1$s」交談的日誌?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13494,22 +13532,22 @@
 msgstr "您確定您要刪除由%s開始記錄的系統日誌?"
 
 #  NOTE 第一個 %s 是聊天室名稱,第二個 %s 是時間
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
 
 #  NOTE 第一個 %s 是聯絡人名稱,第二個 %s 是時間
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13517,51 +13555,51 @@
 "只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日"
 "誌中。"
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "找不到日誌"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "瀏覽日誌目錄(_B)"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "全部日誌大小:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13586,26 +13624,26 @@
 "哪些帳號,並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:493
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13634,22 +13672,22 @@
 msgstr[0] "<b>您有 %d 封新郵件。</b>"
 msgstr[1] "<b>您有 %d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤:%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
@@ -13662,11 +13700,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "多個模組將會被卸載。"
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13677,7 +13715,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13688,11 +13726,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
@@ -13701,95 +13739,95 @@
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "離開(_W)"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "返回(_U)"
+msgid "Goes a_way"
+msgstr "離開(_W)"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "返回(_U)"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "停止輸入(_Y)"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "停止輸入(_Y)"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
@@ -13818,7 +13856,7 @@
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S):"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13837,7 +13875,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "離開期間"
 
@@ -14064,59 +14102,64 @@
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(預設)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "嗶一聲"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "嗶一聲"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "自動"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "指令"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14125,118 +14168,118 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "啟動音效:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "事件"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "測試"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "重置"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "音效"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
@@ -14273,7 +14316,7 @@
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "許可使用者"
 
@@ -14285,38 +14328,38 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -14325,23 +14368,23 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -14365,38 +14408,38 @@
 msgstr "您確定您要刪除被選取的狀態?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。您必須選取一個唯一的標題。"
 
 # TODO - 這個有點不妥,但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
@@ -14449,37 +14492,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "%s 沒有辦法傳送目錄。您需要個別傳送檔案"
-
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+"individually."
+msgstr "%s 沒有辦法傳送目錄,您需要個別傳送目錄內的檔案。"
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1505
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14487,23 +14534,23 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1524
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14511,7 +14558,7 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14524,17 +14571,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器;您大概想傳送啟動器要啟動的檔案,而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14545,59 +14592,66 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:88
+#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "關閉分頁(_T)"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
@@ -14620,7 +14674,7 @@
 msgstr "好友作出回覆的時間上限:"
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
@@ -14671,12 +14725,12 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "好友離開"
+msgstr "好友「長時間離開」"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr "好友使用行動裝置"
+msgstr "好友使用流動通訊器材"
 
 #: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
@@ -14693,7 +14747,7 @@
 "in the contact.\n"
 msgstr ""
 "若果一個好友其實概括了好幾個好友帳號,通訊時便根據這裏\n"
-"所給定的得分值計分,積分最多者為「優先」,成為當時實際\n"
+"所指定的得分值計分,積分最多者為「優先」,成為當時實際\n"
 "使用的好友帳號。\n"
 
 # NOTE 舊版 (1.x) Pidgin 中此譯文經 Etan Reisner (開發者之一) 核實,新版 (2.0) Pidgin 譯文要重新核實
@@ -14712,20 +14766,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "讓你自定各個好友狀態的得分值。"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14787,12 +14841,19 @@
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "注意:「新交談」選項必須設定為「依交談個數」。"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
 #  XXX 要核實譯文!
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
 
@@ -14802,56 +14863,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差,請改良 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr "限制視窗可容之交談數目,亦可選擇以不同的視窗顯示即時訊息和聊天"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin 範例模組"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "範例模組————請看介紹。"
-
-# NOTE 譯文更動 by Ambrose
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"這是一個很有趣的模組,它具有下列的功能:\n"
-"- 它可以在您登入的時候,告訴您是誰寫了這個程式\n"
-"- 它會將所有收到的訊息左右掉轉\n"
-"- 它會在您的好友登入時,立刻送出一個訊息給他們"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14876,19 +14906,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "滑鼠動作"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "提供滑鼠動作的支援"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14991,7 +15021,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15002,8 +15032,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15162,12 +15192,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15256,7 +15286,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "訊息通知"
 
@@ -15264,10 +15294,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin 範例模組"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "範例模組————請看介紹。"
+
+# NOTE 譯文更動 by Ambrose
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"這是一個很有趣的模組,它具有下列的功能:\n"
+"- 它可以在您登入的時候,告訴您是誰寫了這個程式\n"
+"- 它會將所有收到的訊息左右掉轉\n"
+"- 它會在您的好友登入時,立刻送出一個訊息給他們"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "游標顏色"
@@ -15281,39 +15342,31 @@
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 展開器大小"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "交談歷史"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "日誌檢視器"
 
 #  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView展開器"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "選擇顏色"
@@ -15335,36 +15388,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "工具"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -15381,11 +15454,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及 TOC)進行"
-"操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
+"讓您直接輸入指令對各種文字模式的通訊協定(例如 XMPP、MSN、IRC 及 TOC)進行操"
+"作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
 #: ../pidgin/plugins/relnot.c:71
@@ -15501,11 +15574,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -15527,7 +15600,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "時間戳記顯示頻率"
 
@@ -15537,19 +15610,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "時間戳記"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "顯示 iChat 式的時間戳記"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "每隔 N 分鐘顯示 iChat 風格的時間戳記。"
 
@@ -15558,9 +15631,8 @@
 msgstr "時間戳記格式選項"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "強制使用(%s 傳統使用的)24小時制時間格式(_F)"
+msgid "_Force 24-hour time format"
+msgstr "強制使用24小時制時間格式(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15591,19 +15663,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "訊息時間戳記格式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "使用者自定的訊息時間戳記格式。"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15657,19 +15729,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15712,18 +15784,18 @@
 msgid "_Flash window when chat messages are received"
 msgstr "收到聊天訊息後閃動視窗(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgwin 選項"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows 版 Pidgin 選項"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
-msgstr "Windows Pidgin 的相關選項。"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgstr "Windows 版 Pidgin 的相關選項。"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "提供 Windows Pidgin 的相關選項,例如好友清單的停駐功能。"
+msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15774,6 +15846,139 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 展開器大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView展開器"
+
+# FIXME 譯文有待改進 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "顯示/不顯示離線好友"
+
+#~ msgid "Timestamps"
+#~ msgstr "時間戳記"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 帳號"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "無法加入 %s:"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜尋Jabber使用者"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 帳號無效"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "修改 Jabber 密碼"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 協定模組"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 開發者"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#  XXX 這是指模組既沒有設定任何選項,也沒有指明自己是沒有選項的
+#~ msgid "Still need to do something about this."
+#~ msgstr "此模組尚未完成。"
+
+#~ msgid "Autoreply"
+#~ msgstr "自動回覆"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "適用於所有通訊協定的自動回覆"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆,只需在這"
+#~ "模組的選項視窗設定即可;為個別好友設定自動回覆,請在好友清單中以滑鼠右鍵點"
+#~ "擊該個好友;為您的個別帳戶設定自動回覆,請在這模組的選項視窗按「進階」按"
+#~ "紐。"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "設定自動回覆給 %s 的訊息"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "設定自動回覆訊息"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "當自動回覆功能啟動後,每當好友給您送出訊息時,下列訊息將被自動送出:"
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "設定自動回覆訊息(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "自動回覆訊息"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "何時發出自動回覆"
+
+#~ msgid "When my account is _away"
+#~ msgstr "當我的帳號是在「離開」狀態時(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "當我的帳號是在「閒置」狀態時(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "預設回覆訊息(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "狀態訊息"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "以狀態訊息作為自動回覆"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "每當設定了狀態訊息時"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "只在沒有設定自動回覆訊息時"
+
+#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
+#  NOTE: (23:41:12) elb: wing: it is the latter
+#~ msgid "Delay between autoreplies"
+#~ msgstr "自動回覆之間的相隔時間"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "相隔時間下限(分)(_M)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "送出自動回覆訊息的次數"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "次數上限 (_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "我現在不在位子上。請您留下您的訊息,當我回來的時候,我將儘快給您回覆。"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "沒有提供密碼,伺服器無法為你進行認證"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "速率限制錯誤。"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/工具/好友狀態捕捉"
+
+#~ msgid "Slovack"
+#~ msgstr "斯洛伐克文"
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim 網路即時通"
 
@@ -16493,9 +16698,6 @@
 #~ msgid "Offline "
 #~ msgstr "離線"
 
-#~ msgid "Default"
-#~ msgstr "預設"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
--- a/po/zh_TW.po	Tue May 22 12:55:56 2007 +0000
+++ b/po/zh_TW.po	Wed May 23 03:09:25 2007 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.447 2007/05/02 06:33:40 acli Exp $
+# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -23,7 +23,6 @@
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
 # - Private Key 暫譯「私鑰」
-# - Key Pair 暫無譯文 (TODO)
 # - Key Agreement 與 Key Exchange 似乎同義,譯「交換密鑰」
 # - Passphrase 譯「密碼」
 # (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
@@ -50,8 +49,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-05-02 00:00-0400\n"
-"PO-Revision-Date: 2007-05-02 02:00-0400\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-20 01:57-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -86,8 +85,15 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
+#  NOTE Untranslated
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
 #  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -97,18 +103,13 @@
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤,請調查後改以人手完成轉移程序,"
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
-#  NOTE Untranslated
-#: ../finch/finch.c:306
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
 #: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
@@ -123,16 +124,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
-#: ../pidgin/gtkblist.c:3946
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -141,49 +142,49 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5355
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5376
-#: ../pidgin/gtkblist.c:5739
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -199,9 +200,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:468
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1189
@@ -210,16 +211,16 @@
 #: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
 #: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
-#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5795
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -229,15 +230,15 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -250,14 +251,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:541
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -266,15 +267,15 @@
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkblist.c:5794 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
@@ -284,34 +285,34 @@
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他(她)的好友清單%s%s。"
 
 #: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "給予認證?"
 
 #: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "給予認證"
 
 #: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "拒絕"
 
@@ -327,62 +328,66 @@
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "所指定的帳號目前沒有連線。"
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
-#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
 #: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2947 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
 #: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
 #: ../libpurple/protocols/silc/buddy.c:737
 #: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5309
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -390,168 +395,185 @@
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5685
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節,請用快顯選單。"
 
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實:是「加入」抑或「新增」?
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5791
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」?
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "修改設定"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+# XXX 20070518
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "資訊"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "讀取中..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "重命名"
 
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "設定別名"
+
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
 #: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4188
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1200
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2971
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2991
-#: ../pidgin/gtkblist.c:3380 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1347
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -560,12 +582,12 @@
 "上線:%d 人\n"
 "總數:%d 人"
 
-#: ../finch/gntblist.c:1356
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號:%s (%s)"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -575,52 +597,52 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:489
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:490
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
 #: ../libpurple/account.c:983 ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
 #: ../libpurple/protocols/silc/buddy.c:467
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc/chat.c:425
@@ -629,37 +651,36 @@
 #: ../libpurple/protocols/silc/ops.c:1297
 #: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3945
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2162
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-# FIXME 譯文有待改進 - 20061028
-#: ../finch/gntblist.c:2166
-msgid "Toggle offline buddies"
-msgstr "顯示/不顯示離線好友"
-
-#: ../finch/gntblist.c:2172
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "顯示離線好友"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
@@ -683,56 +704,56 @@
 "%s"
 
 #: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3942
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "連線錯誤"
 
 #: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "連線"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
 # NOTE 沒辦法,用不到着重號,又沒法改換字型……
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "尚未支援指令,訊息因此沒有被送出。"
 
 # XXX 這是什麼?
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -741,24 +762,48 @@
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "您離開了聊天室。"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "傳送到"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "交談"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "清空交談內容"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "顯示時間戳記"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "加入好友狀態捕捉..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -766,57 +811,60 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:顯示這個聊天室內的使用者。"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins:顯示「模組」視窗"
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist:顯示好友清單。"
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts:顯示帳號清單。"
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin:顯示除錯視窗"
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs:顯示「偏好設定」視窗"
 
-# FIXME - 20061028
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses:「已儲存的狀態」視窗"
-
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+msgstr "statuses:「狀態清單」視窗"
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -824,18 +872,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "過濾器:"
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "暫停"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "時間戳記"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -874,18 +922,18 @@
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2650
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3035
-#: ../pidgin/gtkblist.c:3048 ../pidgin/gtkblist.c:3050
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
@@ -903,10 +951,10 @@
 msgstr "中止"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -937,75 +985,88 @@
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "電子郵件"
 
 # XXX 要覆查
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "您收到郵件!"
 
-# FIXME check - 20061025
-#  NOTE Jabber 術語,見上
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+# FIXME 原文一詞兩義,根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "已認證對方"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "繼續"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "加入"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀請"
 
 # TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "錯誤"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "模組載入失敗"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "模組卸載失敗"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1016,30 +1077,30 @@
 "Filename: %s\n"
 msgstr ""
 "名稱:%s\n"
-"板本:%s\n"
+"版本:%s\n"
 "簡介:%s\n"
 "作者:%s\n"
 "網站:%s\n"
 "檔名:%s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前,請先載入模組。"
 
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "設定模組"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1061,8 +1122,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5403
-#: ../pidgin/gtkblist.c:5719
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "帳號:"
 
@@ -1213,68 +1274,68 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "以鍵盤的使用為基準"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
 #: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "顯示時間戳記"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "日誌格式"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
 #: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
 #: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "開啟檔案..."
@@ -1315,31 +1376,31 @@
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "訊息"
@@ -1351,7 +1412,7 @@
 
 #: ../finch/gntstatus.c:294
 msgid "Invalid title"
-msgstr "無效的標題"
+msgstr "標題無效"
 
 #: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
@@ -1409,66 +1470,66 @@
 "X, if possible."
 msgstr "當 gnt 的剪則薄內容有所變更時,儘可能把新的內容滙出至 X 視窗系統。"
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 登入"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 登出"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 送出一個訊息給您"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 提到您的暱稱"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 送出一個訊息給您。"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "您收到即時訊息"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天室談話"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "有人在聊天室中提到您的名字"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "也要「嗶」聲!"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "給終端機視窗設定「URGENT」(緊急資訊)提示"
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
@@ -1550,7 +1611,7 @@
 msgstr "找不到 %s 的協定模組"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
@@ -1598,8 +1659,8 @@
 # XXX - Ambrose 20061123
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
@@ -1607,7 +1668,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5199 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1631,7 +1692,7 @@
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1654,40 +1715,40 @@
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1160
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -1763,7 +1824,7 @@
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1863,31 +1924,31 @@
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2189,13 +2250,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2253,8 +2314,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "(只發生在未與傳送者進行交談的情況下)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "備註"
 
@@ -2693,7 +2754,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:314
 #: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
@@ -2703,7 +2764,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:315
 #: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
@@ -2747,9 +2808,9 @@
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與您交談,就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談,就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
 "Yahoo。"
 
 #: ../libpurple/plugins/psychic.c:72
@@ -2958,17 +3019,17 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4490
-#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
@@ -2990,46 +3051,46 @@
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:475
-#: ../libpurple/protocols/bonjour/bonjour.c:482
-#: ../libpurple/protocols/bonjour/bonjour.c:540
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:579
+#: ../libpurple/protocols/bonjour/bonjour.c:589
 #: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:593
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:586
+#: ../libpurple/protocols/bonjour/bonjour.c:596
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/bonjour/bonjour.c:599
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
 #: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:592
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:595
-msgid "Jabber Account"
-msgstr "Jabber 帳號"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP 帳號"
 
 # NOTE 這是通訊協定名稱,不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3135,8 +3196,8 @@
 msgstr "註冊成功!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "密碼"
 
@@ -3162,9 +3223,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3173,8 +3234,8 @@
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3187,14 +3248,14 @@
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3254,37 +3315,37 @@
 msgstr "新增到聊天室..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3035 ../pidgin/gtkblist.c:3359
-#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "上線"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2649
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "帳號"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
@@ -3294,7 +3355,7 @@
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -3339,7 +3400,7 @@
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "封鎖"
 
@@ -3430,14 +3491,14 @@
 msgstr "未知的指令:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "沒有設定主題"
@@ -3473,7 +3534,7 @@
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3496,34 +3557,34 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -3531,28 +3592,28 @@
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
@@ -3568,45 +3629,44 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2122
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
@@ -3616,7 +3676,7 @@
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "姓名"
@@ -3625,232 +3685,232 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s:禁止清單已滿"
 
-#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:293
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:294
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "閒置時間"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "上線自"
 
 #  XXX 其實譯得不太對,可以改進一點
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:418
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: ../libpurple/protocols/irc/msgs.c:436
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:458
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:555
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:556
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為:"
 
-#: ../libpurple/protocols/irc/msgs.c:567
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:581
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:586
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:663
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:775
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
-msgstr "無效的暱稱"
-
-#: ../libpurple/protocols/irc/msgs.c:890
+msgstr "暱稱無效"
+
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱,暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:895
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:955
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1080
-#, c-format
-msgid "Cannot join %s:"
-msgstr "無法加入 %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "無法加入 %s:必須註冊。"
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1127
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;:執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [訊息]:設定一個離開訊息,或者在離開時不指定任何訊息。"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3858,7 +3918,7 @@
 "deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有"
 "「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3867,7 +3927,7 @@
 "devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道"
 "中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3875,7 +3935,7 @@
 "invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的"
 "頻道。"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3883,7 +3943,7 @@
 "j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給"
 "予並有需要)加入所指定的聊天室。"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3891,7 +3951,7 @@
 "join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如"
 "有給予並有需要)加入所指定的聊天室。"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3899,7 +3959,7 @@
 "kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
 "才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3907,22 +3967,22 @@
 "list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作"
 "之後,強行中止您的連線。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要執行的動作&gt;:執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:送出一個指令到 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;:設定或解除頻道╱使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3930,20 +3990,20 @@
 "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾"
 "頻道中)。"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1800
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:送出一個指令到 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3951,7 +4011,7 @@
 "op &lt;暱稱&gt; [暱稱] ...:賦與某個使用者「頻道管理者」權限。您必須具有「頻"
 "道管理者」權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3959,11 +4019,11 @@
 "operwall &lt;訊息&gt;:如果您不知道這是幹什麼用的,您可能沒有辦法使用這個指"
 "令。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:送出一個指令到 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3971,7 +4031,7 @@
 "part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
 "息。"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3979,7 +4039,7 @@
 "ping [暱稱]:查詢某一個使用者的網路回應速度(或在沒有指定使用者時,查詢伺服器"
 "的回應速度)。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3987,16 +4047,16 @@
 "query &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公"
 "眾頻道)。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]:自伺服器離線,並送出指定的訊息。"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4004,23 +4064,23 @@
 "remove &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必須具有「頻道管理者」的"
 "權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time:顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../libpurple/protocols/irc/parse.c:148
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [新主題]:檢視或修改頻道主題"
-
 #: ../libpurple/protocols/irc/parse.c:149
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:設定或解除使用者模式。"
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [新主題]:檢視或修改頻道主題"
 
 #: ../libpurple/protocols/irc/parse.c:150
-msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [暱稱]:送出 CTCP VERSION 要求給使用者"
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:設定或解除使用者模式。"
 
 #: ../libpurple/protocols/irc/parse.c:151
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [暱稱]:給使用者送出 CTCP VERSION 要求"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4028,7 +4088,7 @@
 "voice &lt;暱稱&gt; [暱稱] ...:賦與使用者的「發言」權限。您必須具有「頻道管理"
 "者」的權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4036,29 +4096,29 @@
 "wallops &lt;message&gt;:如果您不知道這是幹什麼用的,您可能就沒有辦法使用它"
 "了。"
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;:取得使用者資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;暱稱&gt;:取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -4073,46 +4133,52 @@
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "伺服器送來了無效的回應。"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
-msgid "Server does not use any supported authentication method"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "無效的伺服器回應。"
-
 # XXX 好像有些怪,譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
@@ -4135,7 +4201,7 @@
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
@@ -4179,7 +4245,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4203,22 +4269,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3046
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "編輯 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "編輯 XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
@@ -4243,16 +4309,16 @@
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "優先次序"
 
@@ -4264,9 +4330,9 @@
 msgstr "英文別名"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
@@ -4285,20 +4351,20 @@
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4307,43 +4373,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4351,69 +4417,69 @@
 "請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令:%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "填入一個或多個欄位,以搜尋Jabber使用者。"
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "填入一個或多個欄位,以搜尋XMPP使用者。"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "搜尋Jabber使用者"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
@@ -4426,88 +4492,88 @@
 msgid "_Handle:"
 msgstr "暱稱(_H):"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
@@ -4531,174 +4597,178 @@
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 帳號無效"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "XMPP 帳號無效"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP 帳號無效,域名是必須設定的。"
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "省/州"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "註冊新的 Jabber 帳戶"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1489
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "未認證"
 
-# NOTE 這些奇怪術語(至「Subscription」條)的解釋由 faceprint 提供
+# NOTE 這些奇怪 Jabber 術語(至「Subscription」條)的解釋由 faceprint 提供
 # NOTE LSchiere2 的補充如下:
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
-#  NOTE Jabber 術語,見上
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "修改 Jabber 密碼"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "修改 XMPP 密碼"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1386
-#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
 #: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1391
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4706,51 +4776,52 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
-msgid "Malformed Jabber ID"
-msgstr "畸型的 Jabber ID"
+# FIXME 譯文聽來好像有點怪 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "畸型的 XMPP 帳號"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4758,78 +4829,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4839,181 +4910,181 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1708
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1792
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]:禁止某使用者進入聊天室"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5022,7 +5093,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5030,19 +5101,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
@@ -5059,54 +5130,64 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 協定模組"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 協定模組"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "域名"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:215
 #: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s 已經離開這個交談。"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 訊息錯誤"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP 訊息錯誤"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -5263,7 +5344,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "嚐試將一個使用者加入不存在的群組"
+msgstr "嘗試將一個使用者加入不存在的群組"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5381,7 +5462,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5420,42 +5501,42 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: ../libpurple/protocols/msn/msn.c:314
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5463,317 +5544,317 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "你在他(她)的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:567
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:571
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:599
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:618
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1528
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
-#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1562
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1563
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1564
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1565
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1593
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1805
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5782,14 +5863,14 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
 "用者存在,但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5804,19 +5885,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
@@ -5892,17 +5973,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5957,7 +6038,7 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/oscar/oscar.c:3454
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
@@ -6067,130 +6148,130 @@
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器;請稍後重試"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "錯誤的帳號或密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "無法辦識您所輸入的帳號內的主機名稱"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "您輸入了無效的帳號"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線,或者您已被他(她)拒絕"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
@@ -6419,8 +6500,8 @@
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6428,8 +6509,8 @@
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6487,8 +6568,8 @@
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
@@ -6623,7 +6704,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6634,7 +6715,7 @@
 "編碼;如果您知道那是什麼編碼,請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6644,53 +6725,54 @@
 "用有問題的用戶端程式。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+# NOTE 據其他PO檔的譯文看,「AP」應該不是「應用程式」
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "應用程式使用者"
-
-#: ../libpurple/protocols/oscar/oscar.c:654
+msgstr "AP 使用者"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6701,100 +6783,100 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6803,7 +6885,7 @@
 "無法連線至認證伺服器:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6812,20 +6894,20 @@
 "無法連線到 BOS 伺服器:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6835,30 +6917,31 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6866,44 +6949,44 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2224
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1472
-#: ../libpurple/protocols/oscar/oscar.c:1515
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6912,53 +6995,53 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
-#: ../libpurple/protocols/oscar/oscar.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1604
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1633
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2194
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2222
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2263
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2397
-#: ../libpurple/protocols/oscar/oscar.c:5192
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6968,17 +7051,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6991,7 +7074,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7004,7 +7087,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7017,38 +7100,38 @@
 "訊息為:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2450
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2546
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7058,21 +7141,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7080,70 +7163,70 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2746
-#: ../libpurple/protocols/oscar/oscar.c:2751
-#: ../libpurple/protocols/oscar/oscar.c:2813
-#: ../libpurple/protocols/oscar/oscar.c:2817
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7151,113 +7234,113 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3450
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3903
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7265,37 +7348,37 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4187
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4432
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4433
+#: ../libpurple/protocols/oscar/oscar.c:4440
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7304,7 +7387,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7315,11 +7398,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4452
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7330,11 +7413,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4571
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7345,17 +7428,17 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4573
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:5010
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4677
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4678
+#: ../libpurple/protocols/oscar/oscar.c:4685
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7363,16 +7446,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4882
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:5064
-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7381,12 +7464,12 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7396,7 +7479,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7406,23 +7489,23 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7432,32 +7515,32 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對,又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7465,89 +7548,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文,但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」,不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
-msgid "The new formatting is invalid."
-msgstr "新的格式是無效的。"
-
 #: ../libpurple/protocols/oscar/oscar.c:6020
+msgid "The new formatting is invalid."
+msgstr "新的格式是無效的。"
+
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7555,74 +7638,74 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6140
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8119,7 +8202,7 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
-msgstr ""
+msgstr "「登入要求」Token 出現錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8128,11 +8211,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8559,7 +8642,7 @@
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "主題:"
 
@@ -8597,18 +8680,18 @@
 msgstr "上次使用的用戶端程式(如已知)"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "使用者名稱"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "輸入了一個不明的使用者 ID"
+msgstr "輸入了一個不明確的使用者 ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
@@ -8674,39 +8757,39 @@
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組:群組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8716,26 +8799,26 @@
 "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組,以加入您的好"
 "友清單。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組:找不到群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在您的 Sametime 社群中,並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8743,12 +8826,12 @@
 "輸入 Notes 通訊錄群組名稱於欄位中,以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8758,59 +8841,59 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐,把他(她)們新增至好友清"
 "單內,或向他(她)們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位,來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入(忽略伺服器重新導向)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
@@ -9983,7 +10066,7 @@
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
 #: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
@@ -10277,26 +10360,26 @@
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10308,36 +10391,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態(請注意:任何人都能看到您)"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "使用 UDP"
 
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "使用 Proxy"
+
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "使用 Proxy"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -10573,21 +10656,21 @@
 msgstr "%s 在呼叫您!"
 
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10596,11 +10679,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10610,11 +10693,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10623,70 +10706,70 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Not at Desk"
 msgstr "不在座位"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+msgid "Not in Office"
+msgstr "不在辦公室"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
-msgid "Not in Office"
-msgstr "不在辦公室"
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
+msgid "On Vacation"
+msgstr "渡假去了"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-msgid "On Vacation"
-msgstr "渡假去了"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10694,92 +10777,92 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線,所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
+msgid "Activate ID..."
+msgstr "啟動 ID..."
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3255
-msgid "Activate ID..."
-msgstr "啟動 ID..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網路的一個聊天室"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:列出Yahoo網路上的聊天室清單"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3830
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:列出Yahoo網路上的聊天室清單"
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3834
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 給好友一個「嗶」引他(她)注意"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10793,57 +10876,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "傳呼伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11053,23 +11136,23 @@
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "使用者"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "隱藏或未登入"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "任何人"
 
@@ -11080,65 +11163,65 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室(交談) %s,%s,%s 失敗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -11146,7 +11229,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11154,18 +11237,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -11179,16 +11262,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -11198,11 +11281,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -11212,22 +11295,22 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "域名"
 
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -11296,12 +11379,12 @@
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../libpurple/server.c:231
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:673
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11310,58 +11393,58 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: ../libpurple/server.c:678
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: ../libpurple/server.c:682
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "離線"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "使用行動裝置"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1288
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1305
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1371
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1373
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
@@ -11371,13 +11454,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11385,79 +11468,79 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:2980
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:2983
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3009
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3021
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3029
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3035
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3043
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3049
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3441
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體,網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3476
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libpurple/util.c:3507
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
@@ -11484,59 +11567,59 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "登入選項"
 
 # NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:500
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "帳號別名(只在本機生效):"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "使用者自定選項"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "使用下列好友圖示:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11545,60 +11628,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../pidgin/gtkaccount.c:1440
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11622,233 +11705,233 @@
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:722
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:743
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
-#: ../pidgin/gtkblist.c:1236
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1183
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1269
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
-#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4499
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2820
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2826
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2830
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2834 ../pidgin/gtkblist.c:6412
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2837
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11857,128 +11940,128 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../pidgin/gtkblist.c:2959
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2980
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:3046
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3048
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3050
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3375
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3377
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3514
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3515 ../pidgin/gtkblist.c:3548
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3516
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3517
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3518 ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3519
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3554
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3557
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3654 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3731
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3733
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3734
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3937 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3968
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
-#: ../pidgin/gtkblist.c:4121
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱:</b>"
 
-#: ../pidgin/gtkblist.c:4128
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>密碼:</b>"
 
-#: ../pidgin/gtkblist.c:4139
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4238
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11996,23 +12079,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4483
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4486
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4492
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4495
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5333
+#: ../pidgin/gtkblist.c:5367
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12021,66 +12104,66 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../pidgin/gtkblist.c:5393 ../pidgin/gtkblist.c:5754
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "群組:"
 
-#: ../pidgin/gtkblist.c:5652
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5668
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5709
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5792
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6432
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6456
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6469 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6477
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6489
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6495
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6544
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6614
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12095,209 +12178,209 @@
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
 #: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12306,234 +12389,234 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
-msgstr "使用者正在輸入..."
-
-#: ../pidgin/gtkconv.c:3159
+msgstr "對方正在輸入..."
+
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
-msgstr "使用者輸入了一些東西,不過暫停了"
+msgstr "對方輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
@@ -12582,14 +12665,14 @@
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber 開發者"
+msgid "XMPP developer"
+msgstr "XMPP 開發者"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "原作者"
 
-#  NOTE 譯文完全不統一,依其他 open source project「慣例」(只有兩三個)譯成「南非荷蘭文」
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -12608,11 +12691,13 @@
 msgid "Bengali"
 msgstr "孟加拉文"
 
-# NOTE 港譯「波斯尼亞」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 港譯「波斯尼亞」,台一般譯「波士尼亞」
 #: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
-msgstr "波士尼亞文"
-
+msgstr "波希尼亞文"
+
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
 #: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
 #: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
@@ -12637,6 +12722,7 @@
 msgstr "德文"
 
 # NOTE 國名是「不丹」,中譯文依國名不依語文名
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
 #: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 #: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
@@ -12689,21 +12775,28 @@
 msgid "French"
 msgstr "法文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
 #: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "加里西亞文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "古吉拉特文翻譯小組"
+
 #: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "希伯來文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
 #: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
-msgstr "北印度文"
+msgstr "印度文"
 
 #: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
@@ -12717,9 +12810,10 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
+#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
 #: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
-msgstr "意大利文"
+msgstr "義大利文"
 
 #: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
 #: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
@@ -12730,20 +12824,31 @@
 msgid "Georgian"
 msgstr "喬治亞文"
 
-# NOTE: 這是KDE譯法,也見於台灣某大學網站 :P
+# FIXME 可以譯好一點 20070520 acli
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 註:KDE 譯「坎納達」
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
-msgstr "坎納達文"
+msgstr "康納達文"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "康納達文翻譯小組"
 
 #: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "韓文"
 
-# NOTE 台譯「庫德」,港譯「庫爾德」;但台灣政府也有用「庫爾德」,故「庫爾德」較好
+#  NOTE 港譯只有「庫爾德」,台譯有「庫德」(標準譯法,看來亦較常見)和「庫爾德」
+#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,保留台式譯法「庫德」
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
-msgstr "庫爾德文"
+msgstr "庫德文"
 
 #: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
@@ -12759,10 +12864,10 @@
 #  NOTE 音譯包括:博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
 #  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
-#  XXX 暫時譯成「挪威布克莫爾文」
+#  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
 #: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
-msgstr "挪威布克莫爾文"
+msgstr "標準挪威文"
 
 #: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
@@ -12774,9 +12879,10 @@
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
+#  NOTE 這是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
 #: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
-msgstr "挪威文"
+msgstr "新挪威文"
 
 #: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
 #: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
@@ -12791,10 +12897,11 @@
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#  XXX 某大學論文譯法
+#  NOTE「普什圖」在三地都看來是較正常的譯法
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
 #: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
-msgstr "巴斯多文 (Pashto)"
+msgstr "普什圖文"
 
 #: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
@@ -12831,14 +12938,16 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
-# NOTE 港譯「泰米爾」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
 #: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
-msgstr "塔米爾文"
-
+msgstr "坦米爾文"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 #: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
-msgstr "特魯固文"
+msgstr "德拉威文"
 
 #: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
@@ -12869,7 +12978,7 @@
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-# XXX Yahoo譯法
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉文"
@@ -12879,115 +12988,118 @@
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s 係一個以 GTK+ 開發的模組化訊息程式,同時提供 AIM、MSN、Yahoo!、Jabber、"
-"ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Bonjour、"
-"Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修改或發佈這個程式,只需按"
-"照 GPL(第二版或任何以後的版本)的條款即可;%s 內已附有一份 GPL, 收錄在名為"
-"「COPYING」的檔案之內。%s 係有版權的著作,版權歸全部貢獻者共同所有,貢獻者芳"
-"名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s 係一個以 GTK+ 開發,圖形介面式的模組化訊息程式,以 libpurple 為基礎,同時"
+"提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
+"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修"
+"改或發佈這個程式,只需按照 GPL(任擇第二版或較新的其他版本)的條款即可;%s 內"
+"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作,版權歸全"
+"部貢獻者共同所有,貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
+"何保用。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
-# NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: ../pidgin/gtkdialogs.c:402
+# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
+# NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../pidgin/gtkdialogs.c:432
+#  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
-msgstr "美工人員"
-
-#: ../pidgin/gtkdialogs.c:447
+msgstr "平面設計"
+
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13003,32 +13115,32 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1096
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併,新群組以後者命名。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1156
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13036,81 +13148,78 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:454
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:506
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:547
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "有新訊息時閃動"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:565
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "結束程式"
 
-#  XXX 這個太奇怪了 (^^;)
+#  NOTE 這是指「未開始」傳輸檔案,不是「未啟動」
 #: ../pidgin/gtkft.c:153
 msgid "Not started"
-msgstr "未啟動"
+msgstr "未開始"
 
 # XXX 暫譯
 #: ../pidgin/gtkft.c:273
@@ -13190,7 +13299,7 @@
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13237,7 +13346,7 @@
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13248,7 +13357,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13258,7 +13367,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13269,7 +13378,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13280,11 +13389,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -13509,26 +13618,26 @@
 "哪些帳號,並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:498
+#: ../pidgin/gtkmain.c:493
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13557,22 +13666,22 @@
 msgstr[0] "<b>您有 %d 封新郵件。</b>"
 msgstr[1] "<b>您有 %d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤:%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
@@ -13987,6 +14096,11 @@
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(預設)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "選取音效"
@@ -14376,33 +14490,37 @@
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "%s 沒有辦法傳送目錄。您需要個別傳送檔案"
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+"individually."
+msgstr "%s 沒有辦法傳送目錄,您需要個別傳送目錄內的檔案。"
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1505
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14410,23 +14528,23 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1524
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14434,7 +14552,7 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14447,17 +14565,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器;您大概想傳送啟動器要啟動的檔案,而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14468,25 +14586,25 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14500,27 +14618,34 @@
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:83
+#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "別名(_A)"
 
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "關閉分頁(_T)"
+
 #: ../pidgin/pidginstock.c:85
-msgid "Close _tabs"
-msgstr "關閉分頁(_T)"
-
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
@@ -14594,7 +14719,7 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "好友離開"
+msgstr "好友「長時間離開」"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
@@ -14710,12 +14835,19 @@
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "注意:「新交談」選項必須設定為「依交談個數」。"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
 #  XXX 要核實譯文!
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
 
@@ -14725,20 +14857,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差,請改良 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -15204,39 +15336,31 @@
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 展開器大小"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "交談歷史"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "日誌檢視器"
 
 #  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView展開器"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "選擇顏色"
@@ -15258,36 +15382,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "工具"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -15304,11 +15448,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及 TOC)進行"
-"操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
+"讓您直接輸入指令對各種文字模式的通訊協定(例如 XMPP、MSN、IRC 及 TOC)進行操"
+"作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
 #: ../pidgin/plugins/relnot.c:71
@@ -15481,9 +15625,8 @@
 msgstr "時間戳記格式選項"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "強制使用(%s 傳統使用的)24小時制時間格式(_F)"
+msgid "_Force 24-hour time format"
+msgstr "強制使用24小時制時間格式(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15514,19 +15657,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:150
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "訊息時間戳記格式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:153
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "使用者自定的訊息時間戳記格式。"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:155
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15697,6 +15840,40 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 展開器大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView展開器"
+
+# FIXME 譯文有待改進 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "顯示/不顯示離線好友"
+
+#~ msgid "Timestamps"
+#~ msgstr "時間戳記"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 帳號"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "無法加入 %s:"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜尋Jabber使用者"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 帳號無效"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "修改 Jabber 密碼"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 協定模組"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 開發者"
+
 #~ msgid "..."
 #~ msgstr "..."
 
@@ -16515,9 +16692,6 @@
 #~ msgid "Offline "
 #~ msgstr "離線"
 
-#~ msgid "Default"
-#~ msgstr "預設"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">來自:</span> %s\n"